wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Akihiro Sagawa : kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: cbe92403398f8bf759c75453f769a34a1fdefc8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbe92403398f8bf759c75453… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:29 2018 +0900 kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45439 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a5da5252291c8df05d2f144cb3f6b9d008b4be1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 12 ++++-------- dlls/kernel32/tests/locale.c | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8dfbb3d..0f81097 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3626,21 +3626,17 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { /* map full-width character to half-width one, e.g. U+30A2 -> U+FF71, U+30D7 -> U+FF8C U+FF9F. */ - if (map_to_halfwidth(wch, dst_ptr, dstlen) == 2) + if (map_to_halfwidth(wch, dst_ptr, len) == 2) { - dstlen--; + len--; dst_ptr++; - if (!dstlen) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } + if (!len) break; } } else *dst_ptr = wch; } - if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE))) + if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE)) || srclen) goto done; srclen = dst_ptr - dst; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index dea22df..b0231aa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2526,7 +2526,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); SetLastError(0xdeadbeef); @@ -2535,7 +2535,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); - todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret);

1 0

Akihiro Sagawa : kernel32/tests: Add more LCMapString tests.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: f33783ce5f20c4ae8c3cb579367e6fe81e6d92b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f33783ce5f20c4ae8c3cb579… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 12 23:30:28 2018 +0900 kernel32/tests: Add more LCMapString tests. Especially combined with LCMAP_HALFWIDTH and LCMAP_UPPERCASE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef2df8ed3681a55a66382164227f8a5a1ae4bf51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/locale.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d686e12..dea22df 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2519,6 +2519,27 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + buf[0] = 'a'; + buf[1] = 0x30ac; + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 0); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 1); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 2); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 3); + todo_wine ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + + ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_UPPERCASE, buf, 2, buf2, 4); + ok(ret == 3, "%s ret %d, expected value 3\n", func_name, ret); + /* LCMAP_UPPERCASE or LCMAP_LOWERCASE should accept src == dst */ lstrcpyW(buf, lower_case); ret = func_ptr(LCMAP_UPPERCASE,

1 0

Piotr Caban : msvcr80: Add gets_s implementation.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: a9c3e0dd856d915eb2d3a91c5066b828af9ee213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c3e0dd856d915eb2d3a91c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 19:29:04 2018 +0200 msvcr80: Add gets_s implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45393 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6b268e77bbe4f4d77748d028ea090b6afc2dd062) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 62 +++++++++++++++------- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 50 insertions(+), 28 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 4921883..853a43f 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -140,7 +140,7 @@ @ cdecl getc(ptr) ucrtbase.getc @ cdecl getchar() ucrtbase.getchar @ cdecl gets(str) ucrtbase.gets -@ stub gets_s +@ cdecl gets_s(ptr long) ucrtbase.gets_s @ cdecl getwc(ptr) ucrtbase.getwc @ cdecl getwchar() ucrtbase.getwchar @ cdecl putc(long ptr) ucrtbase.putc diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 72b36de..e707fb7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1700,7 +1700,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d183953..fca3683 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2058,7 +2058,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 926fe81..529103f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2204,7 +2204,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ stub ilogb diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3a38c84..2dc8a07 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1868,7 +1868,7 @@ @ cdecl getc(ptr) msvcr120.getc @ cdecl getchar() msvcr120.getchar @ cdecl gets(str) msvcr120.gets -@ stub gets_s +@ cdecl gets_s(ptr long) msvcr120.gets_s @ cdecl getwc(ptr) msvcr120.getwc @ cdecl getwchar() msvcr120.getwchar @ stub ilogb diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 73832c1..b3bd775 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1382,7 +1382,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d962479..a12c51e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1355,7 +1355,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6b295cf..fd453da 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4705,31 +4705,53 @@ int CDECL MSVCRT_getc(MSVCRT_FILE* file) } /********************************************************************* - * gets (MSVCRT.@) + * gets_s (MSVCR80.@) */ -char * CDECL MSVCRT_gets(char *buf) +char * CDECL MSVCRT_gets_s(char *buf, MSVCRT_size_t len) { - int cc; - char * buf_start = buf; + char *buf_start = buf; + int cc; - MSVCRT__lock_file(MSVCRT_stdin); - for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; - cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) - { - if(cc != '\r') - *buf++ = (char)cc; - } - MSVCRT__unlock_file(MSVCRT_stdin); + if (!MSVCRT_CHECK_PMT(buf != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(len != 0)) return NULL; - if ((cc == MSVCRT_EOF) && (buf_start == buf)) - { - TRACE(":nothing read\n"); - return NULL; - } - *buf = '\0'; + MSVCRT__lock_file(MSVCRT_stdin); + for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); + len != 0 && cc != MSVCRT_EOF && cc != '\n'; + cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) + { + if (cc != '\r') + { + *buf++ = (char)cc; + len--; + } + } + MSVCRT__unlock_file(MSVCRT_stdin); - TRACE("got '%s'\n", buf_start); - return buf_start; + if (!len) + { + *buf_start = 0; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return NULL; + } + + if ((cc == MSVCRT_EOF) && (buf_start == buf)) + { + TRACE(":nothing read\n"); + return NULL; + } + *buf = '\0'; + + TRACE("got '%s'\n", buf_start); + return buf_start; +} + +/********************************************************************* + * gets (MSVCRT.@) + */ +char * CDECL MSVCRT_gets(char *buf) +{ + return MSVCRT_gets_s(buf, -1); } /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 423bb96..d1498d1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2337,7 +2337,7 @@ @ cdecl getenv(str) MSVCRT_getenv @ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets -@ stub gets_s +@ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl hypot(double double) _hypot

1 0

André Hentschel : dbghelp: Map SIMD dwarf registers on ARM64.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 190cefe4e5818fd5e79cec867e1859df81a92494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=190cefe4e5818fd5e79cec86… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 28 19:39:06 2018 +0200 dbghelp: Map SIMD dwarf registers on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 86864486be64a277f6edf8e66709cd0f17a4eed9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/cpu_arm64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index dd2ccfb..71d4e67 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -158,6 +158,7 @@ static unsigned arm64_map_dwarf_register(unsigned regno, BOOL eh_frame) if (regno == 29) return CV_ARM64_FP; if (regno == 30) return CV_ARM64_LR; if (regno == 31) return CV_ARM64_SP; + if (regno >= 64 && regno <= 95) return CV_ARM64_Q0 + regno - 64; FIXME("Don't know how to map register %d\n", regno); return CV_ARM64_NOREG;

1 0

Zebediah Figura : devenum: Use separate factories for CLSID_SystemDeviceEnum and CLSID_CDeviceMoniker.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: bbd54291614e4740242734856ed5547ca6a49363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd54291614e474024273485… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 26 09:05:30 2018 -0500 devenum: Use separate factories for CLSID_SystemDeviceEnum and CLSID_CDeviceMoniker. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 47921c19e06254a0b66b41c73979aca2978afd5b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/devenum_main.c | 46 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 7bfc593..3499f99 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -56,6 +56,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } +struct class_factory +{ + IClassFactory IClassFactory_iface; + IUnknown *obj; +}; + +static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **obj) { TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), obj); @@ -87,24 +98,15 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **obj) { + struct class_factory *This = impl_from_IClassFactory( iface ); + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(iid), obj); if (!obj) return E_POINTER; if (outer) return CLASS_E_NOAGGREGATION; - if (IsEqualGUID(&IID_ICreateDevEnum, iid)) - { - *obj = &DEVENUM_CreateDevEnum; - return S_OK; - } - if (IsEqualGUID(&IID_IParseDisplayName, iid)) - { - *obj = &DEVENUM_ParseDisplayName; - return S_OK; - } - - return CLASS_E_CLASSNOTAVAILABLE; + return IUnknown_QueryInterface(This->obj, iid, obj); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) @@ -124,24 +126,24 @@ static const IClassFactoryVtbl ClassFactory_vtbl = { ClassFactory_LockServer }; -static IClassFactory devenum_cf = { &ClassFactory_vtbl }; +static struct class_factory create_devenum_cf = { { &ClassFactory_vtbl }, (IUnknown *)&DEVENUM_CreateDevEnum }; +static struct class_factory device_moniker_cf = { { &ClassFactory_vtbl }, (IUnknown *)&DEVENUM_ParseDisplayName }; /*********************************************************************** * DllGetClassObject (DEVENUM.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) { - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + TRACE("(%s, %s, %p)\n", debugstr_guid(clsid), debugstr_guid(iid), obj); - *ppv = NULL; + *obj = NULL; - /* FIXME: we should really have two class factories. - * Oh well - works just fine as it is */ - if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) || - IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) - return IClassFactory_QueryInterface(&devenum_cf, iid, ppv); + if (IsEqualGUID(clsid, &CLSID_SystemDeviceEnum)) + return IClassFactory_QueryInterface(&create_devenum_cf.IClassFactory_iface, iid, obj); + else if (IsEqualGUID(clsid, &CLSID_CDeviceMoniker)) + return IClassFactory_QueryInterface(&device_moniker_cf.IClassFactory_iface, iid, obj); - FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + FIXME("class %s not available\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Zebediah Figura : devenum: Merge factory.c into devenum_main.c.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 9c43af7b244083dca214c8ad3e41eb2445ef1255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c43af7b244083dca214c8ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 26 09:05:29 2018 -0500 devenum: Merge factory.c into devenum_main.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b371cc5130b2393878733834ed97dcfd784cc7d4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/Makefile.in | 1 - dlls/devenum/devenum_main.c | 74 ++++++++++++++++++++++- dlls/devenum/devenum_private.h | 10 --- dlls/devenum/factory.c | 134 ----------------------------------------- 4 files changed, 72 insertions(+), 147 deletions(-) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index 38ca83d..996abf6 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = msvfw32 C_SRCS = \ createdevenum.c \ devenum_main.c \ - factory.c \ mediacatenum.c \ parsedisplayname.c diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index cb4b454..7bfc593 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -1,5 +1,5 @@ /* - * exported dll functions for devenum.dll + * Device Enumeration * * Copyright (C) 2002 John K. Hohm * Copyright (C) 2002 Robert Shearman @@ -56,6 +56,76 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **obj) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), obj); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *obj = iface; + return S_OK; + } + + *obj = NULL; + WARN("no interface for %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + DEVENUM_LockModule(); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + DEVENUM_UnlockModule(); + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **obj) +{ + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(iid), obj); + + if (!obj) return E_POINTER; + + if (outer) return CLASS_E_NOAGGREGATION; + + if (IsEqualGUID(&IID_ICreateDevEnum, iid)) + { + *obj = &DEVENUM_CreateDevEnum; + return S_OK; + } + if (IsEqualGUID(&IID_IParseDisplayName, iid)) + { + *obj = &DEVENUM_ParseDisplayName; + return S_OK; + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) +{ + if (lock) + DEVENUM_LockModule(); + else + DEVENUM_UnlockModule(); + return S_OK; +} + +static const IClassFactoryVtbl ClassFactory_vtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory devenum_cf = { &ClassFactory_vtbl }; + /*********************************************************************** * DllGetClassObject (DEVENUM.@) */ @@ -69,7 +139,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) * Oh well - works just fine as it is */ if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) || IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) - return IClassFactory_QueryInterface(&DEVENUM_ClassFactory.IClassFactory_iface, iid, ppv); + return IClassFactory_QueryInterface(&devenum_cf, iid, ppv); FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 83d0ce3..973a8c4 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -51,15 +51,6 @@ extern LONG dll_refs DECLSPEC_HIDDEN; static inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); } static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); } - -/********************************************************************** - * ClassFactory declaration for devenum.dll - */ -typedef struct -{ - IClassFactory IClassFactory_iface; -} ClassFactoryImpl; - enum device_type { DEVICE_FILTER, @@ -80,7 +71,6 @@ typedef struct MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; HRESULT create_EnumMoniker(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; -extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; extern ICreateDevEnum DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c deleted file mode 100644 index c808fa5..0000000 --- a/dlls/devenum/factory.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * ClassFactory implementation for DEVENUM.dll - * - * Copyright (C) 2002 John K. Hohm - * Copyright (C) 2002 Robert Shearman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "devenum_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(devenum); - -/********************************************************************** - * DEVENUM_IClassFactory_QueryInterface (also IUnknown) - */ -static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, - void **ppvObj) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); - - if (ppvObj == NULL) return E_POINTER; - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IClassFactory)) - { - *ppvObj = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - else if (IsEqualGUID(riid, &IID_IParseDisplayName)) - { - return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj); - } - - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -/********************************************************************** - * DEVENUM_IClassFactory_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IClassFactory_AddRef(IClassFactory *iface) -{ - TRACE("\n"); - - DEVENUM_LockModule(); - - return 2; /* non-heap based object */ -} - -/********************************************************************** - * DEVENUM_IClassFactory_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IClassFactory_Release(IClassFactory *iface) -{ - TRACE("\n"); - - DEVENUM_UnlockModule(); - - return 1; /* non-heap based object */ -} - -/********************************************************************** - * DEVENUM_IClassFactory_CreateInstance - */ -static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(IClassFactory *iface, - IUnknown *pUnkOuter, REFIID riid, void **ppvObj) -{ - TRACE("(%p)->(%p, %s, %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppvObj); - - if (ppvObj == NULL) return E_POINTER; - - /* Don't support aggregation (Windows doesn't) */ - if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION; - - if (IsEqualGUID(&IID_ICreateDevEnum, riid)) - { - *ppvObj = &DEVENUM_CreateDevEnum; - return S_OK; - } - if (IsEqualGUID(&IID_IParseDisplayName, riid)) - { - *ppvObj = &DEVENUM_ParseDisplayName; - return S_OK; - } - - return CLASS_E_CLASSNOTAVAILABLE; -} - -/********************************************************************** - * DEVENUM_IClassFactory_LockServer - */ -static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(IClassFactory *iface, BOOL fLock) -{ - TRACE("\n"); - - if (fLock) - DEVENUM_LockModule(); - else - DEVENUM_UnlockModule(); - return S_OK; -} - -/********************************************************************** - * IClassFactory_Vtbl - */ -static const IClassFactoryVtbl IClassFactory_Vtbl = -{ - DEVENUM_IClassFactory_QueryInterface, - DEVENUM_IClassFactory_AddRef, - DEVENUM_IClassFactory_Release, - DEVENUM_IClassFactory_CreateInstance, - DEVENUM_IClassFactory_LockServer -}; - -/********************************************************************** - * static ClassFactory instance - */ -ClassFactoryImpl DEVENUM_ClassFactory = { { &IClassFactory_Vtbl } };

1 0

Dmitry Timoshkov : user32: Fix the listbox sorting algorithm.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: fa1d30d84ab10e755979f0146ef0cd5a888ddfc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1d30d84ab10e755979f014… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 18:48:46 2018 +0800 user32: Fix the listbox sorting algorithm. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5c765431e2cdf5529713f321b70645c9632529dd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/listbox.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b2a6a96..bb392cd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -837,10 +837,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { INT index, min, max, res; - if (!(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + if (!descr->nb_items || !(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + min = 0; - max = descr->nb_items; - while (min != max) + max = descr->nb_items - 1; + while (min <= max) { index = (min + max) / 2; if (HAS_STRINGS(descr)) @@ -863,10 +864,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res > 0) max = index; + if (res > 0) max = index - 1; else min = index + 1; } - return exact ? -1 : max; + return exact ? -1 : min; }

1 0

Dmitry Timoshkov : user32: Fix order of items passed in WM_COMPAREITEM data.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: ccc32f9f83cc63b75484c506a663c809c7a283ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccc32f9f83cc63b75484c506… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 18:48:43 2018 +0800 user32: Fix order of items passed in WM_COMPAREITEM data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18420c24c98f1bc1dcce5412b1c7972a28c46748) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/listbox.c | 12 ++++++------ dlls/user32/tests/msg.c | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 947db28..b2a6a96 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -844,7 +844,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, str, descr->items[index].str); + res = LISTBOX_lstrcmpiW( descr->locale, descr->items[index].str, str ); else { COMPAREITEMSTRUCT cis; @@ -855,15 +855,15 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) cis.hwndItem = descr->self; /* note that some application (MetaStock) expects the second item * to be in the listbox */ - cis.itemID1 = -1; - cis.itemData1 = (ULONG_PTR)str; - cis.itemID2 = index; - cis.itemData2 = descr->items[index].data; + cis.itemID1 = index; + cis.itemData1 = descr->items[index].data; + cis.itemID2 = -1; + cis.itemData2 = (ULONG_PTR)str; cis.dwLocaleId = descr->locale; res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res < 0) max = index; + if (res > 0) max = index; else min = index + 1; } return exact ? -1 : max; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3dca35b..e7c75eb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2276,9 +2276,7 @@ static void add_message_(int line, const struct recvd_message *msg) ok(msg->wParam == cis->CtlID, "expected %#x, got %#lx\n", cis->CtlID, msg->wParam); ok(cis->hwndItem == ctrl, "expected %p, got %p\n", ctrl, cis->hwndItem); -todo_wine ok((int)cis->itemID1 >= 0, "expected >= 0, got %d\n", cis->itemID1); -todo_wine ok((int)cis->itemID2 == -1, "expected -1, got %d\n", cis->itemID2); sprintf( seq->output, "%s: %p WM_COMPAREITEM: CtlType %#x, CtlID %#x, itemID1 %#x, itemData1 %#lx, itemID2 %#x, itemData2 %#lx", @@ -14273,10 +14271,8 @@ static void test_listbox_messages(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); ok(ret == 0, "expected 0, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); -todo_wine ok(ret == 1, "expected 1, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); -todo_wine ok(ret == 2, "expected 2, got %ld\n", ret); ok_sequence(wm_lb_addstring_sort, "LB_ADDSTRING", TRUE);

1 0

Dmitry Timoshkov : user32/tests: Add a message test for an owner-drawn sorted listbox.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 2209169b8e9220a7be3124693be5d6191f3c88c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2209169b8e9220a7be312469… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 18:48:34 2018 +0800 user32/tests: Add a message test for an owner-drawn sorted listbox. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0d3dbcc01ed2177ca21845004bd9a3f6de027e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 15e9fde..3dca35b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2243,18 +2243,61 @@ static void add_message_(int line, const struct recvd_message *msg) { MEASURE_ITEM_STRUCT mi; MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)msg->lParam; + BOOL is_unicode_data = TRUE; sprintf( seq->output, "%s: %p WM_MEASUREITEM: CtlType %#x, CtlID %#x, itemID %#x, itemData %#lx", msg->descr, msg->hwnd, mis->CtlType, mis->CtlID, mis->itemID, mis->itemData); + if (mis->CtlType == ODT_LISTBOX) + { + HWND ctrl = GetDlgItem(msg->hwnd, mis->CtlID); + is_unicode_data = GetWindowLongA(ctrl, GWL_STYLE) & LBS_HASSTRINGS; + } + mi.u.wp = 0; mi.u.item.CtlType = mis->CtlType; mi.u.item.CtlID = mis->CtlID; mi.u.item.itemID = mis->itemID; mi.u.item.wParam = msg->wParam; seq->wParam = mi.u.wp; - seq->lParam = mis->itemData ? hash_Ly_W((const WCHAR *)mis->itemData) : 0; + if (is_unicode_data) + seq->lParam = mis->itemData ? hash_Ly_W((const WCHAR *)mis->itemData) : 0; + else + seq->lParam = mis->itemData ? hash_Ly((const char *)mis->itemData) : 0; + break; + } + + case WM_COMPAREITEM: + { + COMPAREITEMSTRUCT *cis = (COMPAREITEMSTRUCT *)msg->lParam; + HWND ctrl = GetDlgItem(msg->hwnd, cis->CtlID); + BOOL is_unicode_data = TRUE; + + ok(msg->wParam == cis->CtlID, "expected %#x, got %#lx\n", cis->CtlID, msg->wParam); + ok(cis->hwndItem == ctrl, "expected %p, got %p\n", ctrl, cis->hwndItem); +todo_wine + ok((int)cis->itemID1 >= 0, "expected >= 0, got %d\n", cis->itemID1); +todo_wine + ok((int)cis->itemID2 == -1, "expected -1, got %d\n", cis->itemID2); + + sprintf( seq->output, "%s: %p WM_COMPAREITEM: CtlType %#x, CtlID %#x, itemID1 %#x, itemData1 %#lx, itemID2 %#x, itemData2 %#lx", + msg->descr, msg->hwnd, cis->CtlType, cis->CtlID, + cis->itemID1, cis->itemData1, cis->itemID2, cis->itemData2); + + if (cis->CtlType == ODT_LISTBOX) + is_unicode_data = GetWindowLongA(ctrl, GWL_STYLE) & LBS_HASSTRINGS; + + if (is_unicode_data) + { + seq->wParam = cis->itemData1 ? hash_Ly_W((const WCHAR *)cis->itemData1) : 0; + seq->lParam = cis->itemData2 ? hash_Ly_W((const WCHAR *)cis->itemData2) : 0; + } + else + { + seq->wParam = cis->itemData1 ? hash_Ly((const char *)cis->itemData1) : 0; + seq->lParam = cis->itemData2 ? hash_Ly((const char *)cis->itemData2) : 0; + } break; } @@ -8939,7 +8982,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || message == WM_ENABLE || message == WM_ENTERIDLE || - message == WM_DRAWITEM || message == WM_MEASUREITEM || + message == WM_DRAWITEM || message == WM_MEASUREITEM || message == WM_COMPAREITEM || message == WM_COMMAND || message == WM_IME_SETCONTEXT) { switch (message) @@ -8987,7 +9030,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; - return ret; + return message == WM_COMPAREITEM ? -1 : ret; } static INT_PTR CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) @@ -14054,6 +14097,19 @@ static const struct message wm_lb_addstring[] = { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, { 0 } }; +static const struct message wm_lb_addstring_sort[] = +{ + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ed }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf0f2, 0xf30604ed }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ee }, + { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ed, 0xf30604ee }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf1f2, 0xf30604ee }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ef }, + { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ed, 0xf30604ef }, + { WM_COMPAREITEM, sent|wparam|lparam|parent, 0xf30604ee, 0xf30604ef }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, + { 0 } +}; #define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__) @@ -14119,6 +14175,7 @@ static void test_listbox_messages(void) parent = CreateWindowExA(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + /* with LBS_HASSTRINGS */ listbox = CreateWindowExA(WS_EX_NOPARENTNOTIFY, "ListBox", NULL, WS_CHILD | LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | WS_VISIBLE, 10, 10, 80, 80, parent, (HMENU)ID_LISTBOX, 0, NULL); @@ -14200,6 +14257,34 @@ static void test_listbox_messages(void) log_all_parent_messages--; DestroyWindow(listbox); + + /* with LBS_SORT and without LBS_HASSTRINGS */ + listbox = CreateWindowExA(WS_EX_NOPARENTNOTIFY, "ListBox", NULL, + WS_CHILD | LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_SORT | WS_VISIBLE, + 10, 10, 80, 80, parent, (HMENU)ID_LISTBOX, 0, NULL); + listbox_orig_proc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (ULONG_PTR)listbox_hook_proc); + + check_lb_state(listbox, 0, LB_ERR, 0, 0); + + flush_sequence(); + + log_all_parent_messages++; + + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); + ok(ret == 0, "expected 0, got %ld\n", ret); + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); +todo_wine + ok(ret == 1, "expected 1, got %ld\n", ret); + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); +todo_wine + ok(ret == 2, "expected 2, got %ld\n", ret); + + ok_sequence(wm_lb_addstring_sort, "LB_ADDSTRING", TRUE); + check_lb_state(listbox, 3, LB_ERR, 0, 0); + + log_all_parent_messages--; + + DestroyWindow(listbox); DestroyWindow(parent); }

1 0

Dmitry Timoshkov : user32/tests: Add a test for WM_MEASUREITEM when inserting an item to an owner-drawn listbox.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 4337df5ed97645436e50e57a24390427d812ec62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4337df5ed97645436e50e57a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 18:48:32 2018 +0800 user32/tests: Add a test for WM_MEASUREITEM when inserting an item to an owner-drawn listbox. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d92d91473c8be3e8c89fd68781b7168b19a4d202) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f391ab9..15e9fde 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3,7 +3,7 @@ * * Copyright 1999 Ove Kaaven * Copyright 2003 Dimitrie O. Paun - * Copyright 2004, 2005 Dmitry Timoshkov + * Copyright 2004,2005,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -98,6 +98,22 @@ typedef struct } u; } DRAW_ITEM_STRUCT; +/* encoded MEASUREITEMSTRUCT into a WPARAM */ +typedef struct +{ + union + { + struct + { + UINT CtlType : 4; + UINT CtlID : 4; + UINT itemID : 4; + UINT wParam : 20; + } item; + WPARAM wp; + } u; +} MEASURE_ITEM_STRUCT; + static BOOL test_DestroyWindow_flag; static HWINEVENTHOOK hEvent_hook; static HHOOK hKBD_hook; @@ -2099,6 +2115,25 @@ static BOOL ignore_message( UINT message ) message == WM_DWMNCRENDERINGCHANGED); } +static unsigned hash_Ly_W(const WCHAR *str) +{ + unsigned hash = 0; + + for (; *str; str++) + hash = hash * 1664525u + (unsigned char)(*str) + 1013904223u; + + return hash; +} + +static unsigned hash_Ly(const char *str) +{ + unsigned hash = 0; + + for (; *str; str++) + hash = hash * 1664525u + (unsigned char)(*str) + 1013904223u; + + return hash; +} #define add_message(msg) add_message_(__LINE__,msg); static void add_message_(int line, const struct recvd_message *msg) @@ -2203,6 +2238,26 @@ static void add_message_(int line, const struct recvd_message *msg) seq->lParam = di.u.lp; break; } + + case WM_MEASUREITEM: + { + MEASURE_ITEM_STRUCT mi; + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)msg->lParam; + + sprintf( seq->output, "%s: %p WM_MEASUREITEM: CtlType %#x, CtlID %#x, itemID %#x, itemData %#lx", + msg->descr, msg->hwnd, mis->CtlType, mis->CtlID, + mis->itemID, mis->itemData); + + mi.u.wp = 0; + mi.u.item.CtlType = mis->CtlType; + mi.u.item.CtlID = mis->CtlID; + mi.u.item.itemID = mis->itemID; + mi.u.item.wParam = msg->wParam; + seq->wParam = mi.u.wp; + seq->lParam = mis->itemData ? hash_Ly_W((const WCHAR *)mis->itemData) : 0; + break; + } + default: if (msg->message >= 0xc000) return; /* ignore registered messages */ sprintf( seq->output, "%s: %p %04x wp %08lx lp %08lx", @@ -8884,8 +8939,8 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || message == WM_ENABLE || message == WM_ENTERIDLE || - message == WM_DRAWITEM || message == WM_COMMAND || - message == WM_IME_SETCONTEXT) + message == WM_DRAWITEM || message == WM_MEASUREITEM || + message == WM_COMMAND || message == WM_IME_SETCONTEXT) { switch (message) { @@ -13989,6 +14044,16 @@ static const struct message wm_lb_deletestring_reset[] = { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, { 0 } }; +static const struct message wm_lb_addstring[] = +{ + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ed }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf0f2, 0xf30604ed }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ee }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf1f2, 0xf30604ee }, + { LB_ADDSTRING, sent|wparam|lparam, 0, 0xf30604ef }, + { WM_MEASUREITEM, sent|wparam|lparam|parent, 0xf2f2, 0xf30604ef }, + { 0 } +}; #define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__) @@ -14014,7 +14079,10 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wp; - msg.lParam = lp; + if (message == LB_ADDSTRING) + msg.lParam = lp ? hash_Ly((const char *)lp) : 0; + else + msg.lParam = lp; msg.descr = "listbox"; add_message(&msg); } @@ -14058,6 +14126,8 @@ static void test_listbox_messages(void) check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); ok(ret == 0, "expected 0, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); @@ -14065,6 +14135,7 @@ static void test_listbox_messages(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); ok(ret == 2, "expected 2, got %ld\n", ret); + ok_sequence(wm_lb_addstring, "LB_ADDSTRING", FALSE); check_lb_state(listbox, 3, LB_ERR, 0, 0); flush_sequence();

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
67
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 September 2018