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

Zebediah Figura : quartz/tests: Disable some tests that fail intermittently.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 1f201f1165787f4505be129e4db316c4e69761b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f201f1165787f4505be129e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 21 16:35:21 2020 -0500 quartz/tests: Disable some tests that fail intermittently. The value of these tests is not worth having to repeatedly relax timings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 58 ++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f8b80dd23b..ba8271f829 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3152,9 +3152,10 @@ static void test_filter_state(void) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3228,9 +3229,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3242,9 +3244,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3257,9 +3260,10 @@ static void test_filter_state(void) hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); - ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, - "Expected time near %s, got %s.\n", - wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); @@ -3996,13 +4000,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1234 * 10000) < 40 * 10000, - "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1234 * 10000) < 40 * 10000, + "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1234 * 10000) < 40 * 10000, - "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1234 * 10000) < 40 * 10000, + "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); /* This remains true even if NoFlush is specified. */ @@ -4017,13 +4023,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Pause(control); @@ -4035,13 +4043,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(time - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 80 * 10000, - "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); + if (winetest_interactive) /* Timing problems make this test too liable to fail. */ + ok(abs(current - 1334 * 10000) < 80 * 10000, + "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Stop(control);

1 0

Francois Gouget : testbot: Simplify building Wine.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: tools Branch: master Commit: 34479b22731c94a0283928091d41b4ddf379587c URL: https://source.winehq.org/git/tools.git/?a=commit;h=34479b22731c94a02839280… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 23 10:04:03 2020 +0100 testbot: Simplify building Wine. The shared BuildWine() function will reconfigure Wine if given the configure parameters, and build the specified Wine target. For the build VMs the configure options disable the X and FreeType checks, tell Wine not to build the WineTest executable, and the buildtests target ensures only the tests are built. Meanwhile the wine VMs essentially use the default configure options and make target. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47849 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 71 ++------------------------------------- testbot/bin/build/Reconfig.pl | 55 +++--------------------------- testbot/bin/build/WineReconfig.pl | 29 ++-------------- testbot/bin/build/WineTest.pl | 30 ++--------------- testbot/lib/Build/Utils.pm | 26 +++++++++++++- 5 files changed, 38 insertions(+), 173 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 4c342a5..b2c13c8 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -50,72 +50,6 @@ use WineTestBot::Missions; use WineTestBot::Utils; -# -# Build helpers -# - - -sub BuildNative() -{ - InfoMsg "\nRebuilding native tools\n"; - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-native' && set -x && ". - "time make -j$CPUCount __tooldeps__"); - if ($? != 0) - { - LogMsg "The Wine native tools build failed\n"; - return !1; - } - - return 1; -} - -sub BuildTestExecutables($$$) -{ - my ($TaskMissions, $Impacts, $Build) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - - my (@BuildDirs, @TestExes); - foreach my $TestInfo (values %{$Impacts->{Tests}}) - { - next if (!$TestInfo->{UnitCount}); - push @BuildDirs, $TestInfo->{Path}; - my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; - push @TestExes, $TestExe; - unlink("$DataDir/wine-$Build/$TestExe"); # Ignore errors - } - - InfoMsg "\nBuilding the $Build Wine test executable(s)\n"; - if (!@BuildDirs) - { - InfoMsg "Nothing to do\n"; - return 1; - } - - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time make -j$CPUCount ". join(" ", sort @BuildDirs)); - if ($? != 0) - { - LogMsg "The $Build Wine crossbuild failed\n"; - return !1; - } - - my $Success = 1; - foreach my $TestExe (@TestExes) - { - if (!-f "$DataDir/wine-$Build/$TestExe") - { - LogMsg "Make didn't produce the $Build $TestExe file\n"; - $Success = !1; - } - } - - return $Success; -} - - # # Setup and command line processing # @@ -233,9 +167,8 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - ($Impacts->{PatchedRoot} and !BuildNative()) or - !BuildTestExecutables($TaskMissions, $Impacts, "exe32") or - !BuildTestExecutables($TaskMissions, $Impacts, "exe64")) + !BuildWine($TaskMissions, "no-rm", "exe32", undef, "buildtests") or + !BuildWine($TaskMissions, "no-rm", "exe64", undef, "buildtests")) { exit(1); } diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 62644e1..dd403ef 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -51,60 +51,15 @@ use WineTestBot::Missions; # Build helpers # -sub BuildNative($) -{ - my ($NoRm) = @_; - - rmtree "$DataDir/wine-native" if (!$NoRm); - mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); - - # Rebuild from scratch to make sure cruft will not accumulate - InfoMsg "\nRebuilding native tools\n"; - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-native' && set -x && ". - "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". - "time make -j$CPUCount __tooldeps__"); - - if ($? != 0) - { - LogMsg "The Wine native tools build failed\n"; - return !1; - } - - return 1; -} - -sub BuildCross($$$) -{ - my ($TaskMissions, $NoRm, $Build) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - rmtree "$DataDir/wine-$Build" if (!$NoRm); - mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); - - # Rebuild from scratch to make sure cruft will not accumulate - InfoMsg "\nRebuilding the $Build Wine test executables\n"; - my $CPUCount = GetCPUCount(); - my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". - "time make -j$CPUCount buildtests"); - if ($? != 0) - { - LogMsg "The $Build Wine crossbuild failed\n"; - return !1; - } - - return 1; -} - sub UpdateWineBuilds($$) { my ($TaskMissions, $NoRm) = @_; - return BuildNative($NoRm) && - BuildCross($TaskMissions, $NoRm, "exe32") && - BuildCross($TaskMissions, $NoRm, "exe64"); + my $Configure = "--without-x --without-freetype --disable-winetest"; + return BuildWine($TaskMissions, $NoRm, "exe32", + $Configure, "buildtests") && + BuildWine($TaskMissions, $NoRm, "exe64", + "$Configure --enable-win64", "buildtests"); } diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index ad0d429..383c6bf 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -43,44 +43,21 @@ use File::Path; use Build::Utils; use WineTestBot::Config; use WineTestBot::Missions; +use WineTestBot::Utils qw(ShQuote); # # Build helpers # -sub BuildWine($$$$;$) -{ - my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - rmtree "$DataDir/wine-$Build" if (!$NoRm); - mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); - - # If $NoRm is not set, rebuild from scratch to make sure cruft will not - # accumulate - InfoMsg "\nRebuilding the $Build Wine\n"; - my $CPUCount = GetCPUCount(); - $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time ../wine/configure $Extras && ". - "time make -j$CPUCount"); - if ($? != 0) - { - LogMsg "The $Build Wine build failed\n"; - return !1; - } - - return 1; -} - sub UpdateWineBuilds($$) { my ($TaskMissions, $NoRm) = @_; return BuildWine($TaskMissions, $NoRm, "win32", "") && BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && - BuildWine($TaskMissions, $NoRm, "wow32", "", "$DataDir/wine-wow64"); + BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64=". + ShQuote("$DataDir/wine-wow64")); } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1afe9b8..1a75076 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -47,30 +47,6 @@ use WineTestBot::Missions; use WineTestBot::Utils; -# -# Build helpers -# - -sub BuildWine($$) -{ - my ($TaskMissions, $Build) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - - InfoMsg "\nRebuilding the $Build Wine\n"; - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time make -j$CPUCount"); - if ($? != 0) - { - LogMsg "The $Build build failed\n"; - return !1; - } - - return 1; -} - - # # Test helpers # @@ -447,9 +423,9 @@ if ($Action eq "testpatch") { $Impacts = ApplyPatch("wine", "$DataDir/staging/$FileName"); exit(1) if (!$Impacts or - !BuildWine($TaskMissions, "win32") or - !BuildWine($TaskMissions, "wow64") or - !BuildWine($TaskMissions, "wow32")); + !BuildWine($TaskMissions, "no-rm", "win32", undef) or + !BuildWine($TaskMissions, "no-rm", "wow64", undef) or + !BuildWine($TaskMissions, "no-rm", "wow32", undef)); } foreach my $Mission (@{$TaskMissions->{Missions}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 8a6982c..3050be1 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -29,7 +29,7 @@ use Exporter 'import'; our @EXPORT = qw(GetToolName InfoMsg LogMsg Error GitPull ApplyPatch GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd - GetTestLauncher BuildTestLauncher UpdateAddOns + GetTestLauncher BuildTestLauncher BuildWine UpdateAddOns SetupWineEnvironment GetWineDir GetTestDir RunWine CreateWinePrefix); @@ -317,6 +317,30 @@ sub BuildTestLauncher() return 1; } +sub BuildWine($$$$;$) +{ + my ($TaskMissions, $NoRm, $Build, $Configure, $Targets) = @_; + $Targets ||= ""; + + return 1 if (!$TaskMissions->{Builds}->{$Build}); + # Rebuild from scratch to make sure cruft will not accumulate + rmtree "$DataDir/wine-$Build" if (!$NoRm); + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); + + InfoMsg "\nRebuilding the $Build Wine\n"; + my $CPUCount = GetCPUCount(); + system("cd '$DataDir/wine-$Build' && set -x && ". + (defined $Configure ? "time ../wine/configure $Configure && " : ""). + "time make -j$CPUCount $Targets"); + if ($? != 0) + { + LogMsg "The $Build Wine build failed\n"; + return !1; + } + + return 1; +} + # # Wine addons updates

1 0

Biswapriyo Nath : include/wincodec.idl: Add missing GUIDs.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: fc8d19548fdccd9f7b819c69a47ddf604b2dce61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8d19548fdccd9f7b819c69… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Mar 20 23:29:00 2020 +0530 include/wincodec.idl: Add missing GUIDs. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc8d19548fdccd9f7b81…

1 0

Serge Gautherie : include: Remove now useless forced _WIN32_IE defines.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 7770e26f2d773dcade6f073585b6fac2661e1eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7770e26f2d773dcade6f0735… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Mar 20 19:04:23 2020 +0100 include: Remove now useless forced _WIN32_IE defines. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/rebar.c | 4 ---- dlls/riched20/editstr.h | 4 ---- dlls/shell32/tests/systray.c | 2 +- dlls/urlmon/tests/sec_mgr.c | 3 --- dlls/user32/tests/input.c | 3 --- include/commctrl.h | 4 ---- programs/explorer/systray.c | 1 - programs/wordpad/wordpad.c | 1 - 8 files changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 6c82295d40..21b655b197 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -17,10 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* make sure the structures work with a comctl32 v5.x */ -#define _WIN32_WINNT 0x500 -#define _WIN32_IE 0x500 - #include <assert.h> #include <stdarg.h> diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index a2e6f8584b..608901a5e2 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -21,10 +21,6 @@ #ifndef __EDITSTR_H #define __EDITSTR_H -#ifndef _WIN32_IE -#define _WIN32_IE 0x0400 -#endif - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 0d815a6011..ba5832e51c 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_IE 0x600 + #include <stdarg.h> #include <windows.h> diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 0577af4ecc..4d61079ab8 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -21,9 +21,6 @@ #define COBJMACROS #define CONST_VTABLE -/* needed for IInternetZoneManagerEx2 */ -#define _WIN32_IE 0x0700 - #include <wine/test.h> #include <stdarg.h> #include <stddef.h> diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ddaf7541e4..3fc84f6108 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -45,9 +45,6 @@ * */ -#define _WIN32_WINNT 0x401 -#define _WIN32_IE 0x0500 - #include <stdarg.h> #include <assert.h> diff --git a/include/commctrl.h b/include/commctrl.h index b503f9ef24..dfd2f4a37d 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -53,10 +53,6 @@ HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *); #define COMCTL32_VERSION 5 /* dll version */ -#ifndef _WIN32_IE -#define _WIN32_IE 0x0400 -#endif - #define ICC_LISTVIEW_CLASSES 0x00000001 /* listview, header */ #define ICC_TREEVIEW_CLASSES 0x00000002 /* treeview, tooltips */ #define ICC_BAR_CLASSES 0x00000004 /* toolbar, statusbar, trackbar, tooltips */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index f9e6661af4..dcd75f4e76 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -21,7 +21,6 @@ #include <assert.h> #define NONAMELESSUNION -#define _WIN32_IE 0x500 #include <windows.h> #include <commctrl.h> #include <shellapi.h> diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 579291be80..c8e3132b34 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -20,7 +20,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define _WIN32_IE 0x0400 #include <stdarg.h> #include <stdlib.h>

1 0

Derek Lesho : winegstreamer: Make callback parameter names more generic.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 168ec2c82a861cc7791f05d2f5eb8b2a6cdc1789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=168ec2c82a861cc7791f05d2… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Mar 20 14:54:09 2020 -0500 winegstreamer: Make callback parameter names more generic. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 28 ++++++++++++++-------------- dlls/winegstreamer/gst_cbs.h | 18 +++++++++--------- dlls/winegstreamer/gstdemux.c | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 679d87c52f..71c8180098 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -89,9 +89,9 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { EXISTING_NEW_PAD }; - cbdata.u.existing_new_pad_data.bin = bin; - cbdata.u.existing_new_pad_data.pad = pad; - cbdata.u.existing_new_pad_data.user = user; + cbdata.u.pad_added_data.element = bin; + cbdata.u.pad_added_data.pad = pad; + cbdata.u.pad_added_data.user = user; call_cb(&cbdata); } @@ -123,11 +123,11 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, return cbdata.u.activate_mode_data.ret; } -void no_more_pads_wrapper(GstElement *decodebin, gpointer user) +void no_more_pads_wrapper(GstElement *element, gpointer user) { struct cb_data cbdata = { NO_MORE_PADS }; - cbdata.u.no_more_pads_data.decodebin = decodebin; + cbdata.u.no_more_pads_data.element = element; cbdata.u.no_more_pads_data.user = user; call_cb(&cbdata); @@ -138,15 +138,15 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 { struct cb_data cbdata = { REQUEST_BUFFER_SRC }; - cbdata.u.request_buffer_src_data.pad = pad; - cbdata.u.request_buffer_src_data.parent = parent; - cbdata.u.request_buffer_src_data.ofs = ofs; - cbdata.u.request_buffer_src_data.len = len; - cbdata.u.request_buffer_src_data.buf = buf; + cbdata.u.getrange_data.pad = pad; + cbdata.u.getrange_data.parent = parent; + cbdata.u.getrange_data.ofs = ofs; + cbdata.u.getrange_data.len = len; + cbdata.u.getrange_data.buf = buf; call_cb(&cbdata); - return cbdata.u.request_buffer_src_data.ret; + return cbdata.u.getrange_data.ret; } gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) @@ -192,9 +192,9 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { REMOVED_DECODED_PAD }; - cbdata.u.removed_decoded_pad_data.bin = bin; - cbdata.u.removed_decoded_pad_data.pad = pad; - cbdata.u.removed_decoded_pad_data.user = user; + cbdata.u.pad_removed_data.element = bin; + cbdata.u.pad_removed_data.pad = pad; + cbdata.u.pad_removed_data.user = user; call_cb(&cbdata); } diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index a425671da7..b3e2b237bb 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -54,11 +54,11 @@ struct cb_data { gpointer user; GstBusSyncReply ret; } watch_bus_data; - struct existing_new_pad_data { - GstElement *bin; + struct pad_added_data { + GstElement *element; GstPad *pad; gpointer user; - } existing_new_pad_data; + } pad_added_data; struct query_function_data { GstPad *pad; GstObject *parent; @@ -73,17 +73,17 @@ struct cb_data { gboolean ret; } activate_mode_data; struct no_more_pads_data { - GstElement *decodebin; + GstElement *element; gpointer user; } no_more_pads_data; - struct request_buffer_src_data { + struct getrange_data { GstPad *pad; GstObject *parent; guint64 ofs; guint len; GstBuffer **buf; GstFlowReturn ret; - } request_buffer_src_data; + } getrange_data; struct event_src_data { GstPad *pad; GstObject *parent; @@ -102,11 +102,11 @@ struct cb_data { GstBuffer *buf; GstFlowReturn ret; } got_data_sink_data; - struct removed_decoded_pad_data { - GstElement *bin; + struct pad_removed_data { + GstElement *element; GstPad *pad; gpointer user; - } removed_decoded_pad_data; + } pad_removed_data; struct autoplug_blacklist_data { GstElement *bin; GstPad *pad; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d2f5072235..65cf618655 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2201,8 +2201,8 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) } case EXISTING_NEW_PAD: { - struct existing_new_pad_data *data = &cbdata->u.existing_new_pad_data; - existing_new_pad(data->bin, data->pad, data->user); + struct pad_added_data *data = &cbdata->u.pad_added_data; + existing_new_pad(data->element, data->pad, data->user); break; } case QUERY_FUNCTION: @@ -2220,13 +2220,13 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) case NO_MORE_PADS: { struct no_more_pads_data *data = &cbdata->u.no_more_pads_data; - no_more_pads(data->decodebin, data->user); + no_more_pads(data->element, data->user); break; } case REQUEST_BUFFER_SRC: { - struct request_buffer_src_data *data = &cbdata->u.request_buffer_src_data; - cbdata->u.request_buffer_src_data.ret = request_buffer_src(data->pad, data->parent, + struct getrange_data *data = &cbdata->u.getrange_data; + cbdata->u.getrange_data.ret = request_buffer_src(data->pad, data->parent, data->ofs, data->len, data->buf); break; } @@ -2250,8 +2250,8 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) } case REMOVED_DECODED_PAD: { - struct removed_decoded_pad_data *data = &cbdata->u.removed_decoded_pad_data; - removed_decoded_pad(data->bin, data->pad, data->user); + struct pad_removed_data *data = &cbdata->u.pad_removed_data; + removed_decoded_pad(data->element, data->pad, data->user); break; } case AUTOPLUG_BLACKLIST:

1 0

Derek Lesho : winegstreamer: Move broad callback handling code to gst_cbs.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 3ddf3a720f2a342141550c973f10854b573d80ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ddf3a720f2a342141550c97… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Mar 20 15:00:23 2020 -0500 winegstreamer: Move broad callback handling code to gst_cbs. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 68 ++++++++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/gst_cbs.h | 9 ++---- dlls/winegstreamer/gstdemux.c | 60 +++----------------------------------- 3 files changed, 74 insertions(+), 63 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 71c8180098..a0618798d8 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -20,10 +20,76 @@ #include <gst/gst.h> +#include "objbase.h" + #include "wine/list.h" #include "gst_cbs.h" +static pthread_key_t wine_gst_key; + +void mark_wine_thread(void) +{ + /* set it to non-NULL to indicate that this is a Wine thread */ + pthread_setspecific(wine_gst_key, &wine_gst_key); +} + +static BOOL is_wine_thread(void) +{ + return pthread_getspecific(wine_gst_key) != NULL; +} + +static pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER; +static struct list cb_list = LIST_INIT(cb_list); + +static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) +{ + struct cb_data *cbdata = user; + + if (cbdata->type < GSTDEMUX_MAX) + perform_cb_gstdemux(cbdata); + + pthread_mutex_lock(&cbdata->lock); + cbdata->finished = 1; + pthread_cond_broadcast(&cbdata->cond); + pthread_mutex_unlock(&cbdata->lock); +} + +static DWORD WINAPI dispatch_thread(void *user) +{ + struct cb_data *cbdata; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + pthread_mutex_lock(&cb_list_lock); + + while (1) + { + pthread_cond_wait(&cb_list_cond, &cb_list_lock); + + while (!list_empty(&cb_list)) + { + cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); + list_remove(&cbdata->entry); + + TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); + } + } + + pthread_mutex_unlock(&cb_list_lock); + + CoUninitialize(); + + return 0; +} + +void start_dispatch_thread(void) +{ + pthread_key_create(&wine_gst_key, NULL); + CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL)); +} + /* gstreamer calls our callbacks from threads that Wine did not create. Some * callbacks execute code which requires Wine to have created the thread * (critical sections, debug logging, dshow client code). Since gstreamer can't @@ -31,7 +97,7 @@ * callbacks in code which avoids the Wine thread requirement, and then * dispatch those callbacks on a thread that is known to be created by Wine. * - * This file must not contain any code that depends on the Wine TEB! + * This thread must not run any code that depends on the Wine TEB! */ static void call_cb(struct cb_data *cbdata) diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index b3e2b237bb..4725f23ad1 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -42,7 +42,8 @@ enum CB_TYPE { REMOVED_DECODED_PAD, AUTOPLUG_BLACKLIST, UNKNOWN_TYPE, - QUERY_SINK + QUERY_SINK, + GSTDEMUX_MAX }; struct cb_data { @@ -135,12 +136,8 @@ struct cb_data { struct list entry; }; -extern pthread_mutex_t cb_list_lock DECLSPEC_HIDDEN; -extern pthread_cond_t cb_list_cond DECLSPEC_HIDDEN; -extern struct list cb_list DECLSPEC_HIDDEN; -void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) DECLSPEC_HIDDEN; -BOOL is_wine_thread(void) DECLSPEC_HIDDEN; void mark_wine_thread(void) DECLSPEC_HIDDEN; +void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 65cf618655..412aab2a3b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -static pthread_key_t wine_gst_key; - struct gstdemux { struct strmbase_filter filter; @@ -100,17 +98,6 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface); -void mark_wine_thread(void) -{ - /* set it to non-NULL to indicate that this is a Wine thread */ - pthread_setspecific(wine_gst_key, &wine_gst_key); -} - -BOOL is_wine_thread(void) -{ - return pthread_getspecific(wine_gst_key) != NULL; -} - static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt) { WAVEFORMATEXTENSIBLE *wfe; @@ -2183,14 +2170,8 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) return S_OK; } -pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER; -pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER; -struct list cb_list = LIST_INIT(cb_list); - -void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) +void perform_cb_gstdemux(struct cb_data *cbdata) { - struct cb_data *cbdata = user; - switch(cbdata->type) { case WATCH_BUS: @@ -2274,44 +2255,11 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) data->query); break; } - } - - pthread_mutex_lock(&cbdata->lock); - cbdata->finished = 1; - pthread_cond_broadcast(&cbdata->cond); - pthread_mutex_unlock(&cbdata->lock); -} - -static DWORD WINAPI dispatch_thread(void *user) -{ - struct cb_data *cbdata; - - CoInitializeEx(NULL, COINIT_MULTITHREADED); - - pthread_mutex_lock(&cb_list_lock); - - while(1){ - pthread_cond_wait(&cb_list_cond, &cb_list_lock); - - while(!list_empty(&cb_list)){ - cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); - list_remove(&cbdata->entry); - - TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); + default: + { + assert(0); } } - - pthread_mutex_unlock(&cb_list_lock); - - CoUninitialize(); - - return 0; -} - -void start_dispatch_thread(void) -{ - pthread_key_create(&wine_gst_key, NULL); - CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL)); } static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b)

1 0

Alexandre Julliard : kernelbase: Implement GetNLSVersion/GetNLSVersionEx().
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 86522976c9d5d9f7222ba731c2bd7c0435496f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=86522976c9d5d9f7222ba731… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 12:54:36 2020 +0100 kernelbase: Implement GetNLSVersion/GetNLSVersionEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/locale.c | 133 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 54 ++++++++++++++++ include/winnls.h | 7 +++ 5 files changed, 198 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86522976c9d5d9f7222b…

1 0

Alexandre Julliard : kernelbase: Implement IsValidNLSVersion().
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 84cca2baae23c6afa0c8070f5009fdcfa218e039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cca2baae23c6afa0c8070f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 14:43:45 2020 +0100 kernelbase: Implement IsValidNLSVersion(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/locale.c | 80 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 33 +++++++++++++++++ include/winnls.h | 1 + 5 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1cccaf2209..2e2f7c9a84 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -995,6 +995,7 @@ @ stdcall -import IsValidLanguageGroup(long long) @ stdcall -import IsValidLocale(long long) @ stdcall -import IsValidLocaleName(wstr) +@ stdcall -import IsValidNLSVersion(long wstr ptr) # @ stub IsValidUILanguage @ stdcall -import IsWow64Process(ptr ptr) @ stdcall K32EmptyWorkingSet(long) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3f755aa2b9..4c1e1b4d73 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -87,6 +87,7 @@ static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); static BOOL (WINAPI *pGetNLSVersion)(NLS_FUNCTION,LCID,NLSVERSIONINFO*); static BOOL (WINAPI *pGetNLSVersionEx)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); +static DWORD (WINAPI *pIsValidNLSVersion)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*); static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); @@ -129,6 +130,7 @@ static void InitFunctionPointers(void) X(FindStringOrdinal); X(GetNLSVersion); X(GetNLSVersionEx); + X(IsValidNLSVersion); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -6763,6 +6765,84 @@ static void test_NLSVersion(void) else ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); } else win_skip( "GetNLSVersionEx not available\n" ); + + if (pIsValidNLSVersion) + { + info.dwNLSVersionInfoSize = sizeof(info); + pGetNLSVersion( COMPARE_STRING, LOCALE_USER_DEFAULT, (NLSVERSIONINFO *)&info ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( COMPARE_STRING, L"ja-JP", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = offsetof( NLSVERSIONINFO, dwEffectiveId ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( 2, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( COMPARE_STRING, L"foobar", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + memset( &info, 0xcc, sizeof(info) ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersionInfoSize = sizeof(info); + pGetNLSVersion( COMPARE_STRING, LOCALE_USER_DEFAULT, (NLSVERSIONINFO *)&info ); + info.dwNLSVersion++; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersion += 0x100; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersion -= 0x200; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersion += 0x100; + info.dwDefinedVersion += 0x100; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + info.dwDefinedVersion -= 0x100; + info.guidCustomVersion.Data1 = 0x123; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); + + info.guidCustomVersion = guid_null; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + } + else win_skip( "IsValidNLSVersion not available\n" ); } START_TEST(locale) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fbcae55e98..d74f65c8f1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -878,7 +878,7 @@ @ stdcall IsValidLanguageGroup(long long) @ stdcall IsValidLocale(long long) @ stdcall IsValidLocaleName(wstr) -# @ stub IsValidNLSVersion +@ stdcall IsValidNLSVersion(long wstr ptr) @ stub IsValidRelativeSecurityDescriptor @ stdcall IsValidSecurityDescriptor(ptr) @ stdcall IsValidSid(ptr) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b9a53b0ef3..623cb01280 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4860,6 +4860,39 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocaleName( const WCHAR *locale ) } +/****************************************************************************** + * IsValidNLSVersion (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH IsValidNLSVersion( NLS_FUNCTION func, const WCHAR *locale, + NLSVERSIONINFOEX *info ) +{ + static const GUID GUID_NULL; + NLSVERSIONINFOEX infoex; + DWORD ret; + + if (func != COMPARE_STRING) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (info->dwNLSVersionInfoSize < sizeof(*info) && + (info->dwNLSVersionInfoSize != offsetof( NLSVERSIONINFO, dwEffectiveId ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + infoex.dwNLSVersionInfoSize = sizeof(infoex); + if (!GetNLSVersionEx( func, locale, &infoex )) return FALSE; + + ret = (infoex.dwNLSVersion & ~0xff) == (info->dwNLSVersion & ~0xff); + if (ret && !IsEqualGUID( &info->guidCustomVersion, &GUID_NULL )) + ret = find_sortguid( &info->guidCustomVersion ) != NULL; + + if (!ret) SetLastError( ERROR_SUCCESS ); + return ret; +} + + /*********************************************************************** * LCIDToLocaleName (kernelbase.@) */ diff --git a/include/winnls.h b/include/winnls.h index e563968cf9..e7b478b1c6 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -957,6 +957,7 @@ WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLocaleName(LPCWSTR); +WINBASEAPI DWORD WINAPI IsValidNLSVersion(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); WINBASEAPI INT WINAPI LCIDToLocaleName(LCID,LPWSTR,INT,DWORD); WINBASEAPI INT WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT); WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT);

1 0

Nikolay Sivov : include: Add some missing symbols to mftransform.idl.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 197a37fe4ca8e2b14d64915e3e88d8893eba7422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197a37fe4ca8e2b14d64915e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 15:05:50 2020 +0300 include: Add some missing symbols to mftransform.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mftransform.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mftransform.idl b/include/mftransform.idl index 59e40f95f7..6b9c79572a 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -59,6 +59,11 @@ enum _MFT_INPUT_STATUS_FLAGS MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, }; +enum _MFT_INPUT_DATA_BUFFER_FLAGS +{ + MFT_INPUT_DATA_BUFFER_PLACEHOLDER = 0xffffffff, +}; + enum _MFT_OUTPUT_STREAM_INFO_FLAGS { MFT_OUTPUT_STREAM_WHOLE_SAMPLES = 0x00000001, @@ -185,6 +190,7 @@ interface IMFTransform : IUnknown cpp_quote("HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate);") cpp_quote("EXTERN_GUID(MF_SA_D3D_AWARE, 0xeaa35c29, 0x775e, 0x488e, 0x9b, 0x61, 0xb3, 0x28, 0x3e, 0x49, 0x58, 0x3b);") +cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT, 0x18802c61, 0x324b, 0x4952, 0xab, 0xd0, 0x17, 0x6f, 0xf5, 0xc6, 0x96, 0xff);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC, 0xf81a699a, 0x649a, 0x497d, 0x8c, 0x73, 0x29, 0xf8, 0xfe, 0xd6, 0xad, 0x7a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC_UNLOCK, 0xe5666d6b, 0x3422, 0x4eb6, 0xa4, 0x21, 0xda, 0x7d, 0xb1, 0xf8, 0xe2, 0x07);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_CATEGORY_Attribute, 0xceabba49, 0x506d, 0x4757, 0xa6, 0xff, 0x66, 0xc1, 0x84, 0x98, 0x7e, 0x4e);") @@ -208,3 +214,8 @@ cpp_quote("EXTERN_GUID(MFT_PROCESS_LOCAL_Attribute, 0x543186e4, 0x46 cpp_quote("EXTERN_GUID(MFT_REMUX_MARK_I_PICTURE_AS_CLEAN_POINT, 0x364e8f85, 0x3f2e, 0x436c, 0xb2, 0xa2, 0x44, 0x40, 0xa0, 0x12, 0xa9, 0xe8);") cpp_quote("EXTERN_GUID(MFT_SUPPORT_3DVIDEO, 0x093f81b1, 0x4f2e, 0x4631, 0x81, 0x68, 0x79, 0x34, 0x03, 0x2a, 0x01, 0xd3);") cpp_quote("EXTERN_GUID(MFT_TRANSFORM_CLSID_Attribute, 0x6821c42b, 0x65a4, 0x4e82, 0x99, 0xbc, 0x9a, 0x88, 0x20, 0x5e, 0xcd, 0x0c);") + +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_CLSID, 0xc57a84c0, 0x1a80, 0x40a3, 0x97, 0xb5, 0x92, 0x72, 0xa4, 0x03, 0xc8, 0xae, 1);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_CATEGORY, 0xc57a84c0, 0x1a80, 0x40a3, 0x97, 0xb5, 0x92, 0x72, 0xa4, 0x03, 0xc8, 0xae, 2);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_EXATTRIBUTE_SUPPORTED, 0x456fe843, 0x3c87, 0x40c0, 0x94, 0x9d, 0x14, 0x09, 0xc9, 0x7d, 0xab, 0x2c, 1);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_MULTICHANNEL_CHANNEL_MASK, 0x58bdaf8c, 0x3224, 0x4692, 0x86, 0xd0, 0x44, 0xd6, 0x5c, 0x5b, 0xf8, 0x2b, 1);")

1 0

Piotr Caban : msvcp140: Remove custom standard streams definition.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 6160e0ea58358d81ae39ff275772b052acda59b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6160e0ea58358d81ae39ff27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 20 14:32:30 2020 +0100 msvcp140: Remove custom standard streams definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a632659f9a..8513965dd7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -35,16 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define TICKSPERSEC 10000000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) -#if _MSVCP_VER >= 140 -FILE* __cdecl __acrt_iob_func(unsigned); -#undef stdin -#undef stdout -#undef stderr -#define stdin __acrt_iob_func(STDIN_FILENO) -#define stdout __acrt_iob_func(STDOUT_FILENO) -#define stderr __acrt_iob_func(STDERR_FILENO) -#endif - /* ?_Index(a)ios_base@std@@0HA */ int ios_base_Index = 0; /* ?_Sync(a)ios_base@std@@0_NA */

1 0