March 2018 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : propsys: Add PSGetPropertyKeyFromName stub.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: cbd9354862fa044932b5a0cb7c4c8b141e0a4e3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd9354862fa044932b5a0cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 18 00:21:51 2018 +0000 propsys: Add PSGetPropertyKeyFromName stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index f518519..db20fd3 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -83,7 +83,7 @@ @ stub PSGetPropertyDescriptionByName @ stdcall PSGetPropertyDescriptionListFromString(wstr ptr ptr) @ stub PSGetPropertyFromPropertyStorage -@ stub PSGetPropertyKeyFromName +@ stdcall PSGetPropertyKeyFromName(wstr ptr) @ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 7631023..1dbaee4 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -268,6 +268,12 @@ HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID r return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyKeyFromName(PCWSTR name, PROPERTYKEY *key) +{ + FIXME("%s, %p\n", debugstr_w(name), key); + return E_NOTIMPL; +} + HRESULT WINAPI PSRefreshPropertySchema(void) { FIXME("\n");

1 0

Stefan Leichter : strmdll: Add stub dll.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 13861b7952684505fd4e850b2963926436b17b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=13861b7952684505fd4e850b… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Sun Mar 18 23:49:33 2018 +0100 strmdll: Add stub dll. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/strmdll/Makefile.in | 4 ++++ dlls/strmdll/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/strmdll/strmdll.spec | 5 +++++ 5 files changed, 53 insertions(+) diff --git a/configure b/configure index 0ccf620..88ee44d 100755 --- a/configure +++ b/configure @@ -1512,6 +1512,7 @@ enable_stdole2_tlb enable_stdole32_tlb enable_sti enable_strmbase +enable_strmdll enable_strmiids enable_svrapi enable_sxs @@ -19005,6 +19006,7 @@ wine_fn_config_makefile dlls/sti/tests enable_tests wine_fn_config_makefile dlls/storage.dll16 enable_win16 wine_fn_config_makefile dlls/stress.dll16 enable_win16 wine_fn_config_makefile dlls/strmbase enable_strmbase +wine_fn_config_makefile dlls/strmdll enable_strmdll wine_fn_config_makefile dlls/strmiids enable_strmiids wine_fn_config_makefile dlls/svrapi enable_svrapi wine_fn_config_makefile dlls/sxs enable_sxs diff --git a/configure.ac b/configure.ac index 51a3a79..b6c94a5 100644 --- a/configure.ac +++ b/configure.ac @@ -3631,6 +3631,7 @@ WINE_CONFIG_MAKEFILE(dlls/sti/tests) WINE_CONFIG_MAKEFILE(dlls/storage.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/stress.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/strmbase) +WINE_CONFIG_MAKEFILE(dlls/strmdll) WINE_CONFIG_MAKEFILE(dlls/strmiids) WINE_CONFIG_MAKEFILE(dlls/svrapi) WINE_CONFIG_MAKEFILE(dlls/sxs) diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in new file mode 100644 index 0000000..429cd12 --- /dev/null +++ b/dlls/strmdll/Makefile.in @@ -0,0 +1,4 @@ +MODULE = strmdll.dll + +C_SRCS = \ + main.c diff --git a/dlls/strmdll/main.c b/dlls/strmdll/main.c new file mode 100644 index 0000000..25bb5e2 --- /dev/null +++ b/dlls/strmdll/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Stefan Leichter + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(strmdll); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/strmdll/strmdll.spec b/dlls/strmdll/strmdll.spec new file mode 100644 index 0000000..c50bcaa --- /dev/null +++ b/dlls/strmdll/strmdll.spec @@ -0,0 +1,5 @@ +@ stub CreateAsfFormatSet +@ stub NSSecurityLibraryInit +@ stub SelectCrabis +@ stub SelectHelper +@ stub SelectMediaStream

1 0

Henri Verbeet : usp10: Merge GSUB_initialize_script_cache() and GPOS_expand_script_cache().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 66decba0e9fe4d21a8e6e3dba79cad78a5ed8608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66decba0e9fe4d21a8e6e3db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 16 13:56:29 2018 +0330 usp10: Merge GSUB_initialize_script_cache() and GPOS_expand_script_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 78 ++++++++++++++++----------------------------- dlls/usp10/usp10_internal.h | 10 ++++-- 2 files changed, 35 insertions(+), 53 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 521b816..616835e 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2595,54 +2595,21 @@ static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OP return NULL; } -static void GSUB_initialize_script_cache(ScriptCache *psc) -{ - const OT_ScriptList *script; - const GSUB_Header *header; - SIZE_T i; - - if (!(header = psc->GSUB_Table)) - return; - - script = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); - psc->script_count = GET_BE_WORD(script->ScriptCount); - - TRACE("Initialising %li scripts in this font.\n", psc->script_count); - - if (!psc->script_count) - return; - - if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, psc->script_count, sizeof(*psc->scripts))) - ERR("Failed to allocate script array.\n"); - - for (i = 0; i < psc->script_count; ++i) - { - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], - script->ScriptRecord[i].ScriptTag[1], - script->ScriptRecord[i].ScriptTag[2], - script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].gsub_table = (const BYTE *)script + GET_BE_WORD(script->ScriptRecord[i].Script); - } -} - -static void GPOS_expand_script_cache(ScriptCache *psc) +static void usp10_script_cache_add_script_list(ScriptCache *script_cache, + enum usp10_script_table table, const OT_ScriptList *list) { SIZE_T initial_count, count, i; - const OT_ScriptList *list; - const GPOS_Header *header; LoadedScript *script; OPENTYPE_TAG tag; - if (!(header = psc->GPOS_Table)) - return; + TRACE("script_cache %p, table %#x, list %p.\n", script_cache, table, list); - list = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); if (!(count = GET_BE_WORD(list->ScriptCount))) return; - TRACE("Initialising %lu scripts in this font.\n", count); + TRACE("Adding %lu scripts.\n", count); - initial_count = psc->script_count; + initial_count = script_cache->script_count; for (i = 0; i < count; ++i) { tag = MS_MAKE_TAG(list->ScriptRecord[i].ScriptTag[0], @@ -2650,22 +2617,31 @@ static void GPOS_expand_script_cache(ScriptCache *psc) list->ScriptRecord[i].ScriptTag[2], list->ScriptRecord[i].ScriptTag[3]); - if (!(initial_count && (script = usp10_script_cache_get_script(psc, tag))) - && !(script = usp10_script_cache_add_script(psc, tag))) + if (!(initial_count && (script = usp10_script_cache_get_script(script_cache, tag))) + && !(script = usp10_script_cache_add_script(script_cache, tag))) return; - script->gpos_table = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script); + script->table[table] = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script); } } -static void _initialize_script_cache(ScriptCache *psc) +static void _initialize_script_cache(ScriptCache *script_cache) { - if (!psc->scripts_initialized) - { - GSUB_initialize_script_cache(psc); - GPOS_expand_script_cache(psc); - psc->scripts_initialized = TRUE; - } + const GPOS_Header *gpos_header; + const GSUB_Header *gsub_header; + + if (script_cache->scripts_initialized) + return; + + if ((gsub_header = script_cache->GSUB_Table)) + usp10_script_cache_add_script_list(script_cache, USP10_SCRIPT_TABLE_GSUB, + (const OT_ScriptList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->ScriptList))); + + if ((gpos_header = script_cache->GPOS_Table)) + usp10_script_cache_add_script_list(script_cache, USP10_SCRIPT_TABLE_GPOS, + (const OT_ScriptList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->ScriptList))); + + script_cache->scripts_initialized = TRUE; } HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) @@ -2716,10 +2692,10 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int i; - if (script->gsub_table) + if (script->table[USP10_SCRIPT_TABLE_GSUB]) { DWORD offset; - const OT_Script* table = script->gsub_table; + const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GSUB]; script->language_count = GET_BE_WORD(table->LangSysCount); offset = GET_BE_WORD(table->DefaultLangSys); if (offset) @@ -2747,7 +2723,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) static void GPOS_expand_language_cache(LoadedScript *script) { int count; - const OT_Script* table = script->gpos_table; + const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GPOS]; LoadedLanguage *language; DWORD offset; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index eae0255..08024c9 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -161,10 +161,16 @@ typedef struct { LoadedFeature *features; } LoadedLanguage; +enum usp10_script_table +{ + USP10_SCRIPT_TABLE_GSUB = 0, + USP10_SCRIPT_TABLE_GPOS, + USP10_SCRIPT_TABLE_COUNT +}; + typedef struct { OPENTYPE_TAG tag; - const void *gsub_table; - const void *gpos_table; + const void *table[USP10_SCRIPT_TABLE_COUNT]; LoadedLanguage default_language; BOOL languages_initialized; LoadedLanguage *languages;

1 0

Henri Verbeet : usp10: Use usp10_array_reserve() in GSUB_initialize_language_cache().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: cc131ec07ec0c7746d1d73a07b037169559b5618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc131ec07ec0c7746d1d73a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:11 2018 +0330 usp10: Use usp10_array_reserve() in GSUB_initialize_language_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 616835e..49a88a6 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2690,33 +2690,38 @@ static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_ static void GSUB_initialize_language_cache(LoadedScript *script) { - int i; + const OT_Script *table; + DWORD offset; + SIZE_T i; - if (script->table[USP10_SCRIPT_TABLE_GSUB]) + if (!(table = script->table[USP10_SCRIPT_TABLE_GSUB])) + return; + + if ((offset = GET_BE_WORD(table->DefaultLangSys))) { - DWORD offset; - const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GSUB]; - script->language_count = GET_BE_WORD(table->LangSysCount); - offset = GET_BE_WORD(table->DefaultLangSys); - if (offset) - { - script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.gsub_table = (const BYTE*)table + offset; - } + script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); + script->default_language.gsub_table = (const BYTE *)table + offset; + } - if (script->language_count) - { - TRACE("Deflang %p, LangCount %li\n",script->default_language.gsub_table, script->language_count); + if (!(script->language_count = GET_BE_WORD(table->LangSysCount))) + return; - script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); + TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gsub_table, script->language_count); - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].gsub_table = ((const BYTE*)table + offset); - } - } + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count, sizeof(*script->languages))) + { + ERR("Failed to grow languages array.\n"); + return; + } + + for (i = 0; i < script->language_count; ++i) + { + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], + table->LangSysRecord[i].LangSysTag[1], + table->LangSysRecord[i].LangSysTag[2], + table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].gsub_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); } }

1 0

Piotr Caban : ucrtbase: Add __current_exception() implementation.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: ae5d0b22291d866a49f293e782b43ba025ab77ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5d0b22291d866a49f293e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 19 17:43:57 2018 +0100 ucrtbase: Add __current_exception() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index cb6fd4e..0edd871 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) ucrtbase.__RTDynamicCast @ cdecl __RTtypeid(ptr) ucrtbase.__RTtypeid @ stub __TypeMatch -@ stub __current_exception +@ cdecl __current_exception() ucrtbase.__current_exception @ stub __current_exception_context @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 13698f8..3378283 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -508,4 +508,13 @@ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) data->dofree = 0; } +/********************************************************************* + * __current_exception (UCRTBASE.@) + */ +void** CDECL __current_exception(void) +{ + TRACE("()\n"); + return (void**)&msvcrt_get_thread_data()->exc_record; +} + #endif /* _MSVCR_VER>=140 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5d12b4c..00d779c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -82,7 +82,7 @@ @ stub __conio_common_vcwprintf_s @ stub __conio_common_vcwscanf @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __current_exception +@ cdecl __current_exception() @ stub __current_exception_context @ cdecl __daylight() MSVCRT___p__daylight @ stub __dcrt_get_wide_environment_from_os diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index c4f9f6a..331a087 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -30,7 +30,7 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) ucrtbase.__RTDynamicCast @ cdecl __RTtypeid(ptr) ucrtbase.__RTtypeid @ stub __TypeMatch -@ stub __current_exception +@ cdecl __current_exception() ucrtbase.__current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex

1 0

Zhiyi Zhang : comctl32/datetime: Fix wrong format for DTS_SHORTDATECENTURYFORMAT.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 46dcf0c7cb35a2d7cb46eae722a9e5d161fc5aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dcf0c7cb35a2d7cb46eae7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 19 16:16:24 2018 +0800 comctl32/datetime: Fix wrong format for DTS_SHORTDATECENTURYFORMAT. DTS_SHORTDATECENTURYFORMAT should use short date format Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 97f8226..aa02357 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -322,10 +322,12 @@ DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR format) if (!format) { DWORD format_item; - if (infoPtr->dwStyle & DTS_LONGDATEFORMAT) - format_item = LOCALE_SLONGDATE; - else if ((infoPtr->dwStyle & DTS_TIMEFORMAT) == DTS_TIMEFORMAT) - format_item = LOCALE_STIMEFORMAT; + if ((infoPtr->dwStyle & DTS_SHORTDATECENTURYFORMAT) == DTS_SHORTDATECENTURYFORMAT) + format_item = LOCALE_SSHORTDATE; + else if ((infoPtr->dwStyle & DTS_LONGDATEFORMAT) == DTS_LONGDATEFORMAT) + format_item = LOCALE_SLONGDATE; + else if ((infoPtr->dwStyle & DTS_TIMEFORMAT) == DTS_TIMEFORMAT) + format_item = LOCALE_STIMEFORMAT; else /* DTS_SHORTDATEFORMAT */ format_item = LOCALE_SSHORTDATE; GetLocaleInfoW(LOCALE_USER_DEFAULT, format_item, format_buf, ARRAY_SIZE(format_buf));

1 0

Zhiyi Zhang : comctl32/datetime: Fix length passed to GetLocaleInfoW().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: b683b541fa7c4ffd671807c5c463369c420bb7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b683b541fa7c4ffd671807c5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 19 16:17:10 2018 +0800 comctl32/datetime: Fix length passed to GetLocaleInfoW(). Fix fullday not being rendered when long date format is used. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index aa02357..46ac3e5 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -697,7 +697,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO for (i = 0; i < max_count; i++) { if(GetLocaleInfoW(LOCALE_USER_DEFAULT, lctype + i, - buffer, lstrlenW(buffer))) + buffer, ARRAY_SIZE(buffer))) { GetTextExtentPoint32W(hdc, buffer, lstrlenW(buffer), &size); if (size.cx > cx) cx = size.cx;

1 0

Zhiyi Zhang : comctl32/datetime: Implement DTM_GETIDEALSIZE message.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: ad698fc7be29427b50b772c1f35cccbb0559b95d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad698fc7be29427b50b772c1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 19 16:17:55 2018 +0800 comctl32/datetime: Implement DTM_GETIDEALSIZE message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/datetime.c | 41 +++++++++++++++++++++++++++++++ include/commctrl.h | 2 ++ 3 files changed, 98 insertions(+) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 46ac3e5..6231070 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1454,6 +1454,58 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU return 0; } +static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size) +{ + SIZE field_size; + RECT rect; + SHORT width; + WCHAR txt[80]; + HDC hdc; + HFONT oldFont; + int i; + + size->cx = size->cy = 0; + + hdc = GetDC(infoPtr->hwndSelf); + oldFont = SelectObject(hdc, infoPtr->hFont); + + /* Get text font height */ + DATETIME_ReturnTxt(infoPtr, 0, txt, ARRAY_SIZE(txt)); + GetTextExtentPoint32W(hdc, txt, strlenW(txt), &field_size); + size->cy = field_size.cy; + + /* Get text font width */ + for (i = 0; i < infoPtr->nrFields; i++) + { + DATETIME_ReturnFieldWidth(infoPtr, hdc, i, &width); + size->cx += width; + } + + SelectObject(hdc, oldFont); + ReleaseDC(infoPtr->hwndSelf, hdc); + + if (infoPtr->dwStyle & DTS_UPDOWN) + { + GetWindowRect(infoPtr->hUpdown, &rect); + size->cx += rect.right - rect.left; + } + else + { + size->cx += infoPtr->calbutton.right - infoPtr->calbutton.left; + } + + if (infoPtr->dwStyle & DTS_SHOWNONE) + { + size->cx += infoPtr->checkbox.right - infoPtr->checkbox.left; + } + + /* Add space between controls for them not to get too close */ + size->cx += 12; + size->cy += 4; + + TRACE("cx=%d cy=%d\n", size->cx, size->cy); + return TRUE; +} static LRESULT DATETIME_SetFont (DATETIME_INFO *infoPtr, HFONT font, BOOL repaint) @@ -1585,6 +1637,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case DTM_GETMCFONT: return SendMessageW (infoPtr->hMonthCal, WM_GETFONT, wParam, lParam); + case DTM_GETIDEALSIZE: + return DATETIME_GetIdealSize(infoPtr, (SIZE *)lParam); + case WM_NOTIFY: return DATETIME_Notify (infoPtr, (LPNMHDR)lParam); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 7742dc5..88abce9 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -721,6 +721,46 @@ static void test_dtm_set_and_get_systemtime_with_limits(void) DestroyWindow(hWnd); } +static void test_dtm_get_ideal_size(void) +{ + HWND hwnd; + HDC hdc; + HFONT hfont; + LOGFONTA lf; + TEXTMETRICA tm; + SIZE size; + BOOL r; + + hwnd = create_datetime_control(0); + r = SendMessageA(hwnd, DTM_GETIDEALSIZE, 0, (LPARAM)&size); + if (!r) + { + win_skip("DTM_GETIDEALSIZE is not available\n"); + DestroyWindow(hwnd); + return; + } + + /* Set font so that the test is consistent on Wine and Windows */ + ZeroMemory(&lf, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfHeight = 20; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + + hdc = GetDC(hwnd); + GetTextMetricsA(hdc, &tm); + ReleaseDC(hwnd, hdc); + + r = SendMessageA(hwnd, DTM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(r, "Expect DTM_GETIDEALSIZE message to return true\n"); + ok(size.cx > 0 && size.cy >= tm.tmHeight, + "Expect size.cx > 0 and size.cy >= %d, got cx:%d cy:%d\n", tm.tmHeight, size.cx, size.cy); + + DestroyWindow(hwnd); + DeleteObject(hfont); +} + static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; @@ -821,6 +861,7 @@ START_TEST(datetime) test_dtm_set_and_get_mccolor(); test_dtm_set_and_get_mcfont(); test_dtm_get_monthcal(); + test_dtm_get_ideal_size(); test_wm_set_get_text(); test_dts_shownone(); diff --git a/include/commctrl.h b/include/commctrl.h index 6890b50..ae70cfd 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5009,6 +5009,8 @@ DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) SNDMSG (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) #define DateTime_GetMonthCalFont(hdp) \ SNDMSG (hdp, DTM_GETMCFONT, 0, 0) +#define DateTime_GetIdealSize(hdp, sz) \ + (BOOL) SNDMSG (hdp, DTM_GETIDEALSIZE, 0, (LPARAM)sz) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff)

1 0

Nikolay Sivov : shell32: Use ARRAY_SIZE macro.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 612a1941331485725952d34f3dcd5866fc318dc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612a1941331485725952d34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 19 10:11:27 2018 +0300 shell32: Use ARRAY_SIZE macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 2 +- dlls/shell32/autocomplete.c | 2 +- dlls/shell32/brsfolder.c | 6 ++---- dlls/shell32/classes.c | 2 +- dlls/shell32/control.c | 34 +++++++++++++---------------- dlls/shell32/dde.c | 2 +- dlls/shell32/dialogs.c | 4 ++-- dlls/shell32/recyclebin.c | 18 ++++++---------- dlls/shell32/shell32_main.c | 6 +++--- dlls/shell32/shell32_main.h | 2 ++ dlls/shell32/shelldispatch.c | 2 +- dlls/shell32/shelllink.c | 13 +++++------- dlls/shell32/shellole.c | 4 ++-- dlls/shell32/shellord.c | 8 +++---- dlls/shell32/shellpath.c | 47 ++++++++++++++++++++++------------------- dlls/shell32/shfldr_desktop.c | 16 ++++++-------- dlls/shell32/shfldr_fs.c | 10 ++++----- dlls/shell32/shfldr_netplaces.c | 9 +++----- dlls/shell32/shfldr_unixfs.c | 10 ++++----- dlls/shell32/shlexec.c | 16 +++++++------- dlls/shell32/shlfileop.c | 11 +++++----- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/shell32/systray.c | 11 +++++----- dlls/shell32/xdg.c | 6 ++---- 25 files changed, 114 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=612a1941331485725952…

1 0

Nikolay Sivov : shell32/tests: Add a basic test for SHLimitInputEdit().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 04ec181c6c5f0c6e9ff5faf16c70dc0b71da8df4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ec181c6c5f0c6e9ff5faf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 19 10:10:12 2018 +0300 shell32/tests: Add a basic test for SHLimitInputEdit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 29 +++++++++++++++++++++++++++++ include/shlobj.h | 1 + include/shobjidl.idl | 14 ++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1b140c0..95ebb92 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5217,6 +5217,34 @@ static void test_GetDefaultSearchGUID(void) CoUninitialize(); } +static void test_SHLimitInputEdit(void) +{ + IShellFolder *desktop; + HRESULT hr; + HWND hwnd; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr); + + hr = SHLimitInputEdit(NULL, desktop); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "Failed to create Edit control.\n"); + + hr = SHLimitInputEdit(hwnd, desktop); +todo_wine + ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); + + hr = SHLimitInputEdit(hwnd, desktop); +todo_wine + ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); + + DestroyWindow(hwnd); + IShellFolder_Release(desktop); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5258,6 +5286,7 @@ START_TEST(shlfolder) test_DataObject(); test_GetDefaultColumn(); test_GetDefaultSearchGUID(); + test_SHLimitInputEdit(); OleUninitialize(); } diff --git a/include/shlobj.h b/include/shlobj.h index 09efc18..7cdb4f8 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1801,6 +1801,7 @@ HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT IContextMenu **ppcm); int WINAPI PickIconDlg(HWND owner, WCHAR *path, UINT path_len, int *index); +HRESULT WINAPI SHLimitInputEdit(HWND hwnd, IShellFolder *folder); #include <poppack.h> diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 5e4da5d..e0fe01c 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3699,6 +3699,20 @@ typedef enum ASSOC_FILTER } ASSOC_FILTER; cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);") +[ + uuid(1df0d7f1-b267-4d28-8b10-12e23202a5c4), +] +interface IItemNameLimits : IUnknown +{ + HRESULT GetValidCharacters( + [out, string] LPWSTR *validchars, + [out, string] LPWSTR *invalidchars); + + HRESULT GetMaxLength( + [in, string] LPCWSTR name, + [out] int *max_length); +} + /***************************************************************************** * ShellObjects typelibrary */

1 0