wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Nikolay Sivov : dwrite: Accept platform 0 name records if there's nothing, else.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: ec3c7d9d3a98dc131c3999778ef2aa9049697ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3c7d9d3a98dc131c3999778… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 8 12:31:07 2016 +0300 dwrite: Accept platform 0 name records if there's nothing, else. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 111 +++++++++++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 46 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 99d24ea..0d3482d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1281,20 +1281,69 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la strcpyW(locale, enusW); } break; + case OPENTYPE_PLATFORM_UNICODE: + strcpyW(locale, enusW); + break; default: FIXME("unknown platform %d\n", platform); } } +static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_area, USHORT recid, IDWriteLocalizedStrings *strings) +{ + const TT_NameRecord *record = &header->nameRecord[recid]; + USHORT lang_id, length, offset, encoding, platform; + BOOL ret = FALSE; + + platform = GET_BE_WORD(record->platformID); + lang_id = GET_BE_WORD(record->languageID); + length = GET_BE_WORD(record->length); + offset = GET_BE_WORD(record->offset); + encoding = GET_BE_WORD(record->encodingID); + + if (lang_id < 0x8000) { + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + WCHAR *name_string; + UINT codepage; + + codepage = get_name_record_codepage(platform, encoding); + get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); + + if (codepage) { + DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); + name_string = heap_alloc(sizeof(WCHAR) * (len+1)); + MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, name_string, len); + name_string[len] = 0; + } + else { + int i; + + length /= sizeof(WCHAR); + name_string = heap_strdupnW((LPWSTR)(storage_area + offset), length); + for (i = 0; i < length; i++) + name_string[i] = GET_BE_WORD(name_string[i]); + } + + TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); + add_localizedstring(strings, locale, name_string); + heap_free(name_string); + ret = TRUE; + } + else + FIXME("handle NAME format 1\n"); + + return ret; +} + static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; BYTE *storage_area = 0; USHORT count = 0; + int i, candidate; WORD format; BOOL exists; HRESULT hr; - int i; if (!table_data) return E_FAIL; @@ -1313,20 +1362,18 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP FIXME("unsupported NAME format %d\n", format); } - storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); exists = FALSE; + candidate = -1; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; - USHORT lang_id, length, offset, encoding, platform; + USHORT platform; if (GET_BE_WORD(record->nameID) != id) continue; - exists = TRUE; - /* Right now only accept unicode and windows encoded fonts */ platform = GET_BE_WORD(record->platformID); if (platform != OPENTYPE_PLATFORM_UNICODE && @@ -1337,53 +1384,25 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP continue; } - /* Skip such entries for now, as it's not clear which locale is implied when - unicode platform is used. Also fonts tend to duplicate those strings as - WIN platform entries. */ - if (platform == OPENTYPE_PLATFORM_UNICODE) + /* Skip such entries for now, fonts tend to duplicate those strings as + WIN platform entries. If font does not have WIN or MAC entry for this id, we will + use this Unicode platform entry while assuming en-US locale. */ + if (platform == OPENTYPE_PLATFORM_UNICODE) { + candidate = i; continue; - - lang_id = GET_BE_WORD(record->languageID); - length = GET_BE_WORD(record->length); - offset = GET_BE_WORD(record->offset); - encoding = GET_BE_WORD(record->encodingID); - - if (lang_id < 0x8000) { - WCHAR locale[LOCALE_NAME_MAX_LENGTH]; - WCHAR *name_string; - UINT codepage; - - codepage = get_name_record_codepage(platform, encoding); - get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); - - if (codepage) { - DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); - name_string = heap_alloc(sizeof(WCHAR) * (len+1)); - MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, name_string, len); - name_string[len] = 0; - } - else { - int i; - - length /= sizeof(WCHAR); - name_string = heap_strdupnW((LPWSTR)(storage_area + offset), length); - for (i = 0; i < length; i++) - name_string[i] = GET_BE_WORD(name_string[i]); - } - - TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); - add_localizedstring(*strings, locale, name_string); - heap_free(name_string); } - else { - FIXME("handle NAME format 1\n"); + + if (!(exists = opentype_decode_namerecord(header, storage_area, i, *strings))) continue; - } } if (!exists) { - IDWriteLocalizedStrings_Release(*strings); - *strings = NULL; + if (candidate != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate, *strings); + else { + IDWriteLocalizedStrings_Release(*strings); + *strings = NULL; + } } return exists ? S_OK : E_FAIL;

1 0

Detlef Riekenberg : api-ms-win-core-localization-l1-1-0: Add stub dll.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: b274ce44b0eef09b158b8b44bcee8179c28971fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b274ce44b0eef09b158b8b44b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 6 01:32:17 2016 +0100 api-ms-win-core-localization-l1-1-0: Add stub dll. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-localization-l1-1-0.spec | 47 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 52 insertions(+) diff --git a/configure b/configure index 98ad5f0..85d85a8 100755 --- a/configure +++ b/configure @@ -893,6 +893,7 @@ enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 +enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 enable_api_ms_win_core_localization_obsolete_l1_1_0 @@ -17316,6 +17317,7 @@ wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 +wine_fn_config_dll api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 diff --git a/configure.ac b/configure.ac index b5fc9d1..c4bd6a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2660,6 +2660,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/Makefile.in b/dlls/api-ms-win-core-localization-l1-1-0/Makefile.in new file mode 100644 index 0000000..abccf8b --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l1-1-0.dll diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec new file mode 100644 index 0000000..31abadc --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -0,0 +1,47 @@ +@ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale +@ stub FindNLSString +@ stub FindNLSStringEx +@ stdcall GetACP() kernel32.GetACP +@ stub GetCPFileNameFromRegistry +@ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo +@ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx +@ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW +@ stdcall GetFileMUIInfo(long wstr ptr ptr) kernel32.GetFileMUIInfo +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath +@ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx +@ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW +@ stub GetNLSVersion +@ stub GetNLSVersionEx +@ stdcall GetOEMCP() kernel32.GetOEMCP +@ stub GetProcessPreferredUILanguages +@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) kernel32.GetSystemPreferredUILanguages +@ stdcall GetThreadLocale() kernel32.GetThreadLocale +@ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages +@ stdcall GetThreadUILanguage() kernel32.GetThreadUILanguage +@ stub GetUILanguageInfo +@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) kernel32.GetUserPreferredUILanguages +@ stub IsNLSDefinedString +@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage +@ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup +@ stdcall IsValidLocale(long long) kernel32.IsValidLocale +@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx +@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW +@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID +@ stub NlsCheckPolicy +@ stub NlsEventDataDescCreate +@ stub NlsGetCacheUpdateCount +@ stub NlsUpdateLocale +@ stub NlsUpdateSystemLocale +@ stub NlsWriteEtwEvent +@ stub ResolveLocaleName +@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW +@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW +@ stdcall SetThreadLocale(long) kernel32.SetThreadLocale +@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA +@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW diff --git a/tools/make_specfiles b/tools/make_specfiles index 13748e7..41a9afe 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -186,6 +186,7 @@ my @dll_groups = "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-1", "api-ms-win-core-kernel32-legacy-l1-1-0", + "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-obsolete-l1-1-0", "api-ms-win-core-memory-l1-1-0",

1 0

Andrew Eikum : configure: Be more helpful for users with mis-configured glib-2.0.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 049412a48c9ad10d571ae0d102a3659a2948406c URL: http://source.winehq.org/git/wine.git/?a=commit;h=049412a48c9ad10d571ae0d10… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 5 13:32:33 2016 -0600 configure: Be more helpful for users with mis-configured glib-2.0. glib-2.0 ships different headers for x86 and x86_64, but pkgconfig doesn't support returning different headers for a particular architecture. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +++- configure.ac | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 27373d1d..98ad5f0 100755 --- a/configure +++ b/configure @@ -12697,6 +12697,8 @@ fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + ac_glib2_broken=yes + as_fn_append wine_notices "|glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built." fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -12707,7 +12709,7 @@ test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi -if test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then : +if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ; then : case "x$with_gstreamer" in x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; xno) ;; diff --git a/configure.ac b/configure.ac index 59fc4fa..b5fc9d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1478,9 +1478,11 @@ then [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], [AC_MSG_RESULT([yes]) AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], - [AC_MSG_RESULT([no])])])]) + [AC_MSG_RESULT([no]) + ac_glib2_broken=yes + WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], +WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled]) test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}

1 0

Hugh McMaster : reg: Remove stub output from the 'add' and 'delete' functions.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: dcd05e8e863dd47de9b7cf7745b62260a7d3af42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd05e8e863dd47de9b7cf774… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 5 19:08:30 2016 +1100 reg: Remove stub output from the 'add' and 'delete' functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 00eaab0..e7729a3 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -263,13 +263,9 @@ static BOOL sane_path(const WCHAR *key) static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { - static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s', - ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0}; LPWSTR p; HKEY root,subkey; - reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); - if (!sane_path(key_name)) return 1; @@ -335,11 +331,6 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, LPWSTR p; HKEY root,subkey; - static const WCHAR stubW[] = {'D','E','L','E','T','E', - ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' - ,0}; - reg_printfW(stubW, key_name, value_name, value_empty, value_all, force); - if (!sane_path(key_name)) return 1;

1 0

Francois Gouget : shell32/tests: Allow the short and long forms when checking a ShellExecute() path.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 5af9c123f67f163608d556bb294298073fc6f7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af9c123f67f163608d556bb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:30:31 2016 +0100 shell32/tests: Allow the short and long forms when checking a ShellExecute() path. ShellExecute() sometimes converts a short path to a long one so always accept the long form. Windows XP SP1 often converts them to short paths instead but consider this behavior to be broken. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f89bab0..11b7e57 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -425,13 +425,29 @@ static int StrCmpPath(const char* s1, const char* s2) static void okChildPath_(const char* file, int line, const char* key, const char* expected) { char* result; + int equal, shortequal; result=getChildString("Child", key); if (!result) { okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); return; } - okShell_(file,line)(StrCmpPath(result, expected) == 0, + shortequal = FALSE; + equal = (StrCmpPath(result, expected) == 0); + if (!equal) + { + char altpath[MAX_PATH]; + DWORD rc = GetLongPathNameA(expected, altpath, sizeof(altpath)); + if (0 < rc && rc < sizeof(altpath)) + equal = (StrCmpPath(result, altpath) == 0); + if (!equal) + { + rc = GetShortPathNameA(expected, altpath, sizeof(altpath)); + if (0 < rc && rc < sizeof(altpath)) + shortequal = (StrCmpPath(result, altpath) == 0); + } + } + okShell_(file,line)(equal || broken(shortequal) /* XP SP1 */, "%s expected '%s', got '%s'\n", key, expected, result); } #define okChildPath(key, expected) okChildPath_(__FILE__, __LINE__, (key), (expected))

1 0

Francois Gouget : shell32/tests: Fix the ShellExecute() environment variable inheritance checks.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: bfc1244381b2d785495aaf50f703e9bf950bec9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc1244381b2d785495aaf50f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:26:59 2016 +0100 shell32/tests: Fix the ShellExecute() environment variable inheritance checks. The child process does not inherit environment variables when the calling process does not have elevated privileges and specifies SEE_MASK_NOZONECHECKS. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3cf80b6..f89bab0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -648,8 +648,19 @@ static INT_PTR shell_execute_ex_(const char* file, int line, c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); - okChildInt_(file, line, "ShlexecVarLE", 0); - okChildString_(file, line, "ShlexecVar", "Present", "Present"); + /* When NOZONECHECKS is specified the environment variables are not + * inherited if the process does not have elevated privileges. + */ + if ((mask & SEE_MASK_NOZONECHECKS) && skip_shlexec_tests) + { + okChildInt_(file, line, "ShlexecVarLE", 203); + okChildString_(file, line, "ShlexecVar", "", ""); + } + else + { + okChildInt_(file, line, "ShlexecVarLE", 0); + okChildString_(file, line, "ShlexecVar", "Present", "Present"); + } } return rc;

1 0

Francois Gouget : shell32/tests: Move a test_argify() check so it is run even if we could not create associations.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: c1636cd27929a33e7de960902db53ff967a74dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1636cd27929a33e7de960902… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:26:18 2016 +0100 shell32/tests: Move a test_argify() check so it is run even if we could not create associations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8e9325f..3cf80b6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1538,6 +1538,18 @@ static void test_argify(void) const char* cmd; unsigned i, count; + /* Test with a long parameter */ + for (rc = 0; rc < MAX_PATH; rc++) + fileA[rc] = 'a' + rc % 26; + fileA[MAX_PATH-1] = '\0'; + sprintf(params, "shlexec \"%s\" %s", child_file, fileA); + + /* We need NOZONECHECKS on Win2003 to block a dialog */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); + okShell(rc > 32, "failed: rc=%lu\n", rc); + okChildInt("argcA", 4); + okChildPath("argvA3", fileA); + if (skip_shlexec_tests) { skip("No argify tests due to lack of .shlexec association\n"); @@ -1602,18 +1614,6 @@ static void test_argify(void) has_cl2a = test_one_cmdline(&(test->cmd)); test++; } - - /* Test with a long parameter */ - for (rc = 0; rc < MAX_PATH; rc++) - fileA[rc] = 'a' + rc % 26; - fileA[MAX_PATH-1] = '\0'; - sprintf(params, "shlexec \"%s\" %s", child_file, fileA); - - /* We need NOZONECHECKS on Win2003 to block a dialog */ - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); - okShell(rc > 32, "failed: rc=%lu\n", rc); - okChildInt("argcA", 4); - okChildPath("argvA3", fileA); } static void test_filename(void)

1 0

Francois Gouget : shell32/tests: Skip a few ShellExecute() tests when the process has insufficient privileges.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 96baeb72c21518e87195cdd31174b86d7d20796e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96baeb72c21518e87195cdd31… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:25:47 2016 +0100 shell32/tests: Skip a few ShellExecute() tests when the process has insufficient privileges. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 4f708df..8e9325f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2124,12 +2124,15 @@ static void test_lnks(void) okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); - /* An explicit class overrides lnk's ContextMenuHandler */ - rc=shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec"); - okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError()); - okChildInt("argcA", 5); - okChildString("argvA3", "Open"); - okChildPath("argvA4", filename); + if (!skip_shlexec_tests) + { + /* An explicit class overrides lnk's ContextMenuHandler */ + rc=shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec"); + okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError()); + okChildInt("argcA", 5); + okChildString("argvA3", "Open"); + okChildPath("argvA4", filename); + } if (dllver.dwMajorVersion>=6) { @@ -2241,14 +2244,17 @@ static void test_exes(void) "notaverb", argv0, NULL, NULL, NULL); todo_wine okShell(rc == SE_ERR_NOASSOC, "returned %lu\n", rc); - /* A class overrides the normal handling of executables too */ - /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */ - rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, - NULL, argv0, NULL, NULL, ".shlexec"); - todo_wine okShell(rc > 32, "returned %lu\n", rc); - okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); - todo_wine okChildPath("argvA4", argv0); + if (!skip_shlexec_tests) + { + /* A class overrides the normal handling of executables too */ + /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */ + rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, + NULL, argv0, NULL, NULL, ".shlexec"); + todo_wine okShell(rc > 32, "returned %lu\n", rc); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "Open"); + todo_wine okChildPath("argvA4", argv0); + } } typedef struct

1 0

Francois Gouget : shell32/tests: Remove support for a todo_wine flag in ShellExecute()'s test_lnks() loop.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 13fdfedeadd9e839f71b41843c1a8c3ccac7e98c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fdfedeadd9e839f71b41843… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:25:14 2016 +0100 shell32/tests: Remove support for a todo_wine flag in ShellExecute()'s test_lnks() loop. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 259ba06..4f708df 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2189,14 +2189,7 @@ static void test_lnks(void) okChildString("argvA3", "Lnk"); } sprintf(params, test->basename, tmpdir); - if ((test->todo & 0x8)==0) - { - okChildPath("argvA4", params); - } - else - { - okChildPath("argvA4", params); - } + okChildPath("argvA4", params); } test++; }

1 0

Francois Gouget : shell32/tests: Fix a ShellExecute() race condition.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: f4130de33e90321cd07893295e41ef757cb9974d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4130de33e90321cd07893295… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:24:45 2016 +0100 shell32/tests: Fix a ShellExecute() race condition. On Windows XP SP1 a ShellExecute() call that is supposed to fail succeeds instead. This means the child process is started but ShellExecute() returns without waiting for it, resulting in a race condition on the child's results file. So use our shell_execute_ex() wrapper instead as it always waits for the child process. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9d57ca9..259ba06 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1844,7 +1844,8 @@ static void test_fileurls(void) return; } - rc = (INT_PTR)ShellExecuteA(NULL, NULL, "file:///nosuchfile.shlexec", NULL, NULL, SW_SHOWNORMAL); + rc = shell_execute_ex(SEE_MASK_FLAG_NO_UI, NULL, + "file:///nosuchfile.shlexec", NULL, NULL, NULL); if (rc > 32) { win_skip("shell32 is too old (likely < 4.72). Skipping the file URL tests\n");

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
76
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 February 2016