December 2014 - Wine-Commits

André Hentschel : winetest: Improve output when dll is a stub.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: tools Branch: master Commit: af075ef37059020ee9595971fcb55dcfef60851e URL: http://source.winehq.org/git/tools.git/?a=commit;h=af075ef37059020ee9595971… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 4 00:16:35 2014 +0100 winetest: Improve output when dll is a stub. --- winetest/dissect | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 61e85ca..cd24fc3 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -252,7 +252,7 @@ while ($_ = <IN>) { last if (!/^\s+([^ =]+)=(.*)\r?$/); my $module = $1; $dllinfo{$module} = { version => $2 }; - if ($2 eq "dll is missing" || $2 =~ /^load error/) + if ($2 eq "dll is missing" || $2 =~ /^load error/ || $2 eq "dll is a stub") { print SUM "- $module - missing - - - - -\n"; } @@ -365,6 +365,10 @@ foreach my $dll (sort keys %dllinfo) { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); } + elsif ($dllinfo{$dll}->{version} eq "dll is a stub") + { + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">dll is a stub</td></tr>\n", escapeHTML($dll); + } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n",

1 0

Martin Storsjo : api-ms-win-core-datetime-l1-1-1: Add stub dll.
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 3488f88fe686e1cd2e0dfd4ae3ca009258a65ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3488f88fe686e1cd2e0dfd4ae… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:13 2014 +0200 api-ms-win-core-datetime-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-datetime-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 1fde6f8..df48de3 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_advpack enable_amstream enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_console_l1_1_0 +enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_fibers_l1_1_1 @@ -16776,6 +16777,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 +wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 diff --git a/configure.ac b/configure.ac index b43dee1..eea1baf 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,6 +2647,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) diff --git a/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in new file mode 100644 index 0000000..2bf9501 --- /dev/null +++ b/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-datetime-l1-1-1.dll diff --git a/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec b/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec new file mode 100644 index 0000000..5630929 --- /dev/null +++ b/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA +@ stub GetDateFormatEx +@ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW +@ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA +@ stub GetTimeFormatEx +@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW diff --git a/tools/make_specfiles b/tools/make_specfiles index c0ba789..641f18e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -162,6 +162,7 @@ my @dll_groups = "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-datetime-l1-1-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-localization-l1-2-1: Add stub dll.
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 6ccff80f476b1cc41f7c7d481bcd6268c12bb742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccff80f476b1cc41f7c7d481… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:12 2014 +0200 api-ms-win-core-localization-l1-2-1: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-localization-l1-2-1.spec | 60 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 65 insertions(+) diff --git a/configure b/configure index 8f7d91d..1fde6f8 100755 --- a/configure +++ b/configure @@ -869,6 +869,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_1 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 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 @@ -16789,6 +16790,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-1 enable_api_ms_win_core_libraryloader_l1_1_1 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 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 diff --git a/configure.ac b/configure.ac index 0e4028f..b43dee1 100644 --- a/configure.ac +++ b/configure.ac @@ -2661,6 +2661,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-1) 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) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) diff --git a/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in b/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in new file mode 100644 index 0000000..e5208a8 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l1-2-1.dll diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec new file mode 100644 index 0000000..ccba739 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -0,0 +1,60 @@ +@ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale +@ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx +@ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW +@ stub FindNLSString +@ stub FindNLSStringEx +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GetACP() kernel32.GetACP +@ 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 +@ stub GetFileMUIInfo +@ stub GetFileMUIPath +@ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW +@ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA +@ 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 +@ stub 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 GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName +@ stdcall GetUserGeoID(long) kernel32.GetUserGeoID +@ stub GetUserPreferredUILanguages +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte +@ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx +@ stub IsNLSDefinedString +@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage +@ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup +@ stdcall IsValidLocale(long long) kernel32.IsValidLocale +@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName +@ stub IsValidNLSVersion +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ 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 ResolveLocaleName +@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW +@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW +@ stub SetProcessPreferredUILanguages +@ stdcall SetThreadLocale(long) kernel32.SetThreadLocale +@ stdcall SetThreadPreferredUILanguages(long ptr ptr) kernel32.SetThreadPreferredUILanguages +@ stdcall SetThreadUILanguage(long) kernel32.SetThreadUILanguage +@ stdcall SetUserGeoID(long) kernel32.SetUserGeoID +@ 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 d5a7ae2..c0ba789 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -161,6 +161,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-file-l2-1-0", + "api-ms-win-core-localization-l1-2-1", ], [ "ole32",

1 0

Qian Hong : usp10: Make sure fallbackFont is NULL terminated.
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 0cf62bec4143ae7ee164b1265b9507c01d0b7c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf62bec4143ae7ee164b1265… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Dec 3 22:15:37 2014 +0800 usp10: Make sure fallbackFont is NULL terminated. --- dlls/usp10/usp10.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6aa6b3e..5efbb82 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -500,23 +500,23 @@ const scriptData scriptInformation[] = { {{Script_Tai_Le, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','a','l','e'), - {'M','i','c','r','o','s','o','f','t',' ','T','a','i',' ','L','e'}}, + {'M','i','c','r','o','s','o','f','t',' ','T','a','i',' ','L','e',0}}, {{Script_New_Tai_Lue, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','a','l','u'), - {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e'}}, + {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e',0}}, {{Script_New_Tai_Lue_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','a','l','u'), - {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e'}}, + {'M','i','c','r','o','s','o','f','t',' ','N','e','w',' ','T','a','i',' ','L','u','e',0}}, {{Script_Khmer, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x53, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), - {'D','a','u','n','P','e','n','h'}}, + {'D','a','u','n','P','e','n','h',0}}, {{Script_Khmer_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x53, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), - {'D','a','u','n','P','e','n','h'}}, + {'D','a','u','n','P','e','n','h',0}}, {{Script_CJK_Han, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('h','a','n','i'), @@ -540,59 +540,59 @@ const scriptData scriptInformation[] = { {{Script_Yi, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('y','i',' ',' '), - {'M','i','c','r','o','s','o','f','t',' ','Y','i',' ','B','a','i','t','i'}}, + {'M','i','c','r','o','s','o','f','t',' ','Y','i',' ','B','a','i','t','i',0}}, {{Script_Ethiopic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5e, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('e','t','h','i'), - {'N','y','a','l','a'}}, + {'N','y','a','l','a',0}}, {{Script_Ethiopic_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5e, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('e','t','h','i'), - {'N','y','a','l','a'}}, + {'N','y','a','l','a',0}}, {{Script_Mongolian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_MONGOLIAN, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','o','n','g'), - {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i'}}, + {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i',0}}, {{Script_Mongolian_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_MONGOLIAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','o','n','g'), - {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i'}}, + {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i',0}}, {{Script_Tifinagh, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','f','n','g'), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_NKo, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('n','k','o',' '), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Vai, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('v','a','i',' '), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Vai_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('v','a','i',' '), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Cherokee, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5c, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','h','e','r'), - {'P','l','a','n','t','a','g','e','n','e','t',' ','C','h','e','r','o','k','e','e'}}, + {'P','l','a','n','t','a','g','e','n','e','t',' ','C','h','e','r','o','k','e','e',0}}, {{Script_Canadian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x5d, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','a','n','s'), - {'E','u','p','h','e','m','i','a'}}, + {'E','u','p','h','e','m','i','a',0}}, {{Script_Ogham, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','g','a','m'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Runic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('r','u','n','r'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Braille, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('b','r','a','i'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Surrogates, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, 0x00000000, @@ -604,19 +604,19 @@ const scriptData scriptInformation[] = { {{Script_Deseret, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('d','s','r','t'), - {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l'}}, + {'S','e','g','o','e',' ','U','I',' ','S','y','m','b','o','l',0}}, {{Script_Osmanya, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','s','m','a'), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_Osmanya_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('o','s','m','a'), - {'E','b','r','i','m','a'}}, + {'E','b','r','i','m','a',0}}, {{Script_MathAlpha, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','a','t','h'), - {'C','a','m','b','r','i','a',' ','M','a','t','h'}}, + {'C','a','m','b','r','i','a',' ','M','a','t','h',0}}, {{Script_Hebrew_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_HEBREW, 0, 1, 0, 0, HEBREW_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('h','e','b','r'),

1 0

Alexandre Julliard : kernel32/tests: Allow the parent directory to receive a modified event.
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 0ab2311cd5c766fb14d8ce799cd02461c40c5aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab2311cd5c766fb14d8ce799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 21:32:46 2014 +0100 kernel32/tests: Allow the parent directory to receive a modified event. --- dlls/kernel32/tests/change.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index ad22f18..19e55bb 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -554,9 +554,18 @@ static void test_readdirectorychanges(void) ok( r == WAIT_OBJECT_0, "should be ready\n" ); ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); - ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); + ok( ov.InternalHigh == 0x18 || ov.InternalHigh == 0x12 + 0x18, + "ov.InternalHigh wrong %lx\n", ov.InternalHigh); pfni = (PFILE_NOTIFY_INFORMATION) buffer; + if (pfni->NextEntryOffset) /* we may get a modified event on the parent dir */ + { + ok( pfni->NextEntryOffset == 0x12, "offset wrong %x\n", pfni->NextEntryOffset ); + ok( pfni->Action == FILE_ACTION_MODIFIED, "action wrong %d\n", pfni->Action ); + ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n"); + pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); + } ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong\n" );

1 0

Henri Verbeet : wined3d: Record the data type of shader resources.
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 3aa9fe6bef7a3440845c7410c98e3e98a79eb70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa9fe6bef7a3440845c7410c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:11 2014 +0100 wined3d: Record the data type of shader resources. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 32 +++++++++++----------- dlls/wined3d/glsl_shader.c | 16 +++++------ dlls/wined3d/shader.c | 56 ++++++++++++++++++++++++++++++--------- dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 36 +++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 11 +++++++- 7 files changed, 115 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3aa9fe6bef7a3440845c7…

1 0

Marc Bessières : riched20/tests: Use SendMessageA with char buffer (Valgrind).
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 85ca920d94c1c3be0c051d4b2a7597b6fdc069eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ca920d94c1c3be0c051d4b2… Author: Marc Bessières <marc.bessieres(a)mykolab.com> Date: Mon Nov 24 21:19:49 2014 +0100 riched20/tests: Use SendMessageA with char buffer (Valgrind). --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 244f065..101aec0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7379,7 +7379,7 @@ static void test_EM_FINDWORDBREAK_A(void) char buf[2]; buf[0] = delimiter_tests[i].c; buf[1] = 0; - SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); result = SendMessageA(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); if (buf[0] == 0x20) todo_wine

1 0

Yifu Wang : msvcr120: Added wchar_t* fields to struct MSVCRT_lconv.
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 08d050899322f0783db52e3b621e16b93aad7cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d050899322f0783db52e3b6… Author: Yifu Wang <ywang(a)esri.com> Date: Fri Nov 21 11:36:46 2014 -0800 msvcr120: Added wchar_t* fields to struct MSVCRT_lconv. --- configure | 1 + configure.ac | 1 + dlls/msvcr120/tests/Makefile.in | 5 ++ dlls/msvcr120/tests/msvcr120.c | 155 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/locale.c | 151 ++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 10 +++ 6 files changed, 323 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08d050899322f0783db52…

1 0

Henri Verbeet : wined3d: Take the resource data type into account in shader_glsl_gen_sample_code() .
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: 5c3d52468cf9f33f816d2d67d7a0022eeeead9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3d52468cf9f33f816d2d67d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:12 2014 +0100 wined3d: Take the resource data type into account in shader_glsl_gen_sample_code(). --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a351932..0ab591f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -65,6 +65,7 @@ struct glsl_sample_function { const char *name; DWORD coord_mask; + enum wined3d_data_type data_type; }; enum heap_node_op @@ -1800,14 +1801,15 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, - const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst) + const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *dst, + enum wined3d_data_type data_type) { struct glsl_dst_param glsl_dst; DWORD mask; if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) { - switch (dst->reg.data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: shader_addline(buffer, "%s%s = %s(", @@ -1824,7 +1826,7 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; default: - FIXME("Unhandled data type %#x.\n", dst->reg.data_type); + FIXME("Unhandled data type %#x.\n", data_type); shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; @@ -1837,7 +1839,7 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst(struct wined3d_shader_buffer *buffer, const struct wined3d_shader_instruction *ins) { - return shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + return shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); } /** Process GLSL instruction modifiers */ @@ -1899,6 +1901,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL lod = flags & WINED3D_GLSL_SAMPLE_LOD; BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; + sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; + /* Note that there's no such thing as a projected cube texture. */ switch (resource_type) { @@ -2265,7 +2269,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ } - shader_glsl_append_dst(ins->ctx->buffer, ins); + shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], sample_function->data_type); shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", sample_function->name, shader_glsl_get_prefix(version->type), sampler); @@ -2397,7 +2401,7 @@ static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); @@ -2425,17 +2429,17 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "tmp0%s = %s / %s;\n", dst_mask, src0_param.param_str, src1_param.param_str); - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s / %s);\n", src0_param.param_str, src1_param.param_str); @@ -2443,7 +2447,7 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) } else if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); @@ -2907,7 +2911,7 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction continue; shader_addline(ins->ctx->buffer, "tmp0%s = (", mask_char); } - else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst))) + else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); @@ -3185,23 +3189,23 @@ static void shader_glsl_sincos(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "tmp0%s = sin(%s);\n", dst_mask, src0_param.param_str); - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "cos(%s));\n", src0_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "sin(%s));\n", src0_param.param_str); } } else if (ins->dst[1].reg.type != WINED3DSPR_NULL) { - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_addline(buffer, "cos(%s));\n", src0_param.param_str); }

1 0

André Hentschel : fusion: Add implementation for CreateAssemblyCacheItem.
by Alexandre Julliard Dec. 3, 2014

Dec. 3, 2014

Module: wine Branch: master Commit: bf70fe3611c2b655c28d6afc7ff0afd8ccb49e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf70fe3611c2b655c28d6afc7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 30 13:15:45 2014 +0100 fusion: Add implementation for CreateAssemblyCacheItem. --- dlls/fusion/asmcache.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 9125655..dd84d38 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -41,6 +41,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); +typedef struct { + IAssemblyCache IAssemblyCache_iface; + + LONG ref; + HANDLE lock; +} IAssemblyCacheImpl; + +typedef struct { + IAssemblyCacheItem IAssemblyCacheItem_iface; + + LONG ref; +} IAssemblyCacheItemImpl; + static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; @@ -141,13 +154,6 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version, /* IAssemblyCache */ -typedef struct { - IAssemblyCache IAssemblyCache_iface; - - LONG ref; - HANDLE lock; -} IAssemblyCacheImpl; - static inline IAssemblyCacheImpl *impl_from_IAssemblyCache(IAssemblyCache *iface) { return CONTAINING_RECORD(iface, IAssemblyCacheImpl, IAssemblyCache_iface); @@ -351,16 +357,33 @@ done: return hr; } +static const IAssemblyCacheItemVtbl AssemblyCacheItemVtbl; + static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *iface, DWORD dwFlags, PVOID pvReserved, IAssemblyCacheItem **ppAsmItem, LPCWSTR pszAssemblyName) { - FIXME("(%p, %d, %p, %p, %s) stub!\n", iface, dwFlags, pvReserved, + IAssemblyCacheItemImpl *item; + + FIXME("(%p, %d, %p, %p, %s) semi-stub!\n", iface, dwFlags, pvReserved, ppAsmItem, debugstr_w(pszAssemblyName)); - return E_NOTIMPL; + if (!ppAsmItem) + return E_INVALIDARG; + + *ppAsmItem = NULL; + + item = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyCacheItemImpl)); + if (!item) + return E_OUTOFMEMORY; + + item->IAssemblyCacheItem_iface.lpVtbl = &AssemblyCacheItemVtbl; + item->ref = 1; + + *ppAsmItem = &item->IAssemblyCacheItem_iface; + return S_OK; } static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyScavenger(IAssemblyCache *iface, @@ -560,12 +583,6 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved /* IAssemblyCacheItem */ -typedef struct { - IAssemblyCacheItem IAssemblyCacheItem_iface; - - LONG ref; -} IAssemblyCacheItemImpl; - static inline IAssemblyCacheItemImpl *impl_from_IAssemblyCacheItem(IAssemblyCacheItem *iface) { return CONTAINING_RECORD(iface, IAssemblyCacheItemImpl, IAssemblyCacheItem_iface);

1 0