wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : ws2_32: Map ENOTCONN to STATUS_INVALID_CONNECTION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: cbd4f85ad389f4ee409109807f26304bae243ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd4f85ad389f4ee40910980… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:44 2021 -0500 ws2_32: Map ENOTCONN to STATUS_INVALID_CONNECTION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfc3bea8ea3..9eeb506f985 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -833,7 +833,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case ENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case ENOTCONN: return STATUS_INVALID_CONNECTION; case ETIMEDOUT: return STATUS_IO_TIMEOUT; case ENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case ENETDOWN: return STATUS_NETWORK_BUSY; @@ -960,7 +960,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case WSAEADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case WSAECONNREFUSED: return STATUS_CONNECTION_REFUSED; case WSAESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case WSAENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case WSAENOTCONN: return STATUS_INVALID_CONNECTION; case WSAETIMEDOUT: return STATUS_IO_TIMEOUT; case WSAENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case WSAENETDOWN: return STATUS_NETWORK_BUSY; @@ -985,7 +985,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_NETWORK_BUSY: return WSAEALREADY; case STATUS_NETWORK_UNREACHABLE: return WSAENETUNREACH; case STATUS_CONNECTION_REFUSED: return WSAECONNREFUSED; - case STATUS_CONNECTION_DISCONNECTED: return WSAENOTCONN; + case STATUS_INVALID_CONNECTION: return WSAENOTCONN; case STATUS_CONNECTION_RESET: return WSAECONNRESET; case STATUS_CONNECTION_ABORTED: return WSAECONNABORTED; case STATUS_CANCELLED: return WSA_OPERATION_ABORTED;

1 0

Francois Gouget : winetest/build-patterns: Add links to the test commits.
by Alexandre Julliard 06 May '21

06 May '21

Module: tools Branch: master Commit: ebbd6ac838bd3ef7bd9261959983eb49f933ad33 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ebbd6ac838bd3ef7bd92619… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 6 14:23:00 2021 +0200 winetest/build-patterns: Add links to the test commits. This provides a link to the most likely culprit when a test starts failing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 149 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 146 insertions(+), 3 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index d16050d..eb152c8 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -31,7 +31,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $patternbuilds $fixed_threshold/; +use vars qw/$workdir $gitdir $gitweb $patternbuilds $fixed_threshold/; require "winetest.conf"; my $name0=$0; @@ -249,6 +249,9 @@ my %reports; # - name # The uniquely identifying test name in the form 'module:unit'. # +# - source +# The source file for that test unit. +# # - colors # A hashtable of colors indexed by failure count. # @@ -303,6 +306,10 @@ my %reports; # # - status # A hashtable of test results indexed by the build name. +# +# - commits +# A hashtable of the commit objects, indexed first buy build name and then +# by commit id. my %tests; foreach my $build (@sortedbuilds) @@ -339,7 +346,7 @@ foreach my $build (@sortedbuilds) while (my $line = <$fh>) { chomp $line; - my ($testname, $_source, @items) = split / /, $line; + my ($testname, $source, @items) = split / /, $line; if ($testname !~ /:/) { error("found an invalid test unit name ($testname) in '$filename'\n"); @@ -347,7 +354,13 @@ foreach my $build (@sortedbuilds) } $build->{hastest}->{$testname} = 1; my $test = $tests{$testname}; - $tests{$testname} = $test = { name => $testname } if (!$test); + if (!$test) + { + $tests{$testname} = $test = { + name => $testname, + source => $source, + }; + } foreach my $statreps (@items) { @@ -604,6 +617,80 @@ foreach my $testname (keys %tests) } +# +# Collect the related commits +# + +# A hashtable of commit objects indexed by their Git commit id. +# Each object has the following fields: +# +# - index +# An integer recording the commit order, with 0 for the newest commit and +# negative numbers for the others. +# +# - id +# The Git commit id. +# +# - build +# The Git commit id of the first build after this commit. +# +# - summary +# The commit summary. +my %commits; + +# A hashtable mapping filenames to a set of matching commit objects indexed by +# Git commit id. +my %path2commits; + +my $cmd = "git log --pretty=oneline --name-status $sortedbuilds[0]->{name}^..$sortedbuilds[-1]->{name}"; +if (open(my $fh, "-|", $cmd)) +{ + my $index = 0; + my ($commit, $build); + foreach my $line (<$fh>) + { + chomp $line; + if ($line =~ /^([0-9a-f]{40}) (.*)$/) + { + my ($commitid, $summary) = ($1, $2); + # The commits are returned in reverse chronological order. So the + # build commit comes first, then the commits that got into it. + $build = $builds{$commitid} if ($builds{$commitid}); + if (!$build) + { + error("$commit does not belong to any build\n"); + next; + } + $commits{$commitid} = $commit = { + index => $index--, + id => $commitid, + build => $build, + summary => $summary, + }; + } + elsif ($line =~ /^R[0-9]+\t(\S+)\t(\S+)$/ or $line =~ /^.\t(\S+)$/) + { + my ($path1, $path2) = ($1, $2); + if (!$commit) + { + error("did not find a commit before: $line\n"); + next; + } + foreach my $filename ($path1, $path2) + { + next if (!$filename); + $path2commits{$filename}->{$commit->{id}} = $commit; + } + } + else + { + error("found an unsupported line type in '$cmd' output: $line\n"); + } + } + close($fh); +} + + # # Compute color gradients # @@ -830,6 +917,54 @@ sub write_pattern_line($$$) print $html "</div> $label\n"; } +sub index2symbol($) +{ + my ($index) = @_; + my @symbols = ("0".."9", "a".."z", "A".."Z"); + return $symbols[$index % 62]; +} + +sub write_commits($$) +{ + my ($html, $test) = @_; + + print $html "<div class='pattern'>"; + my $i = 0; + my @symbuilds; + foreach my $build (@sortedbuilds) + { + if ($test->{commits}->{$build->{name}}) + { + my $symbol = index2symbol($i++); + push @symbuilds, [$symbol, $build]; + printf $html "<a title='%s'>%s</a>", + short_date($build->{date}), $symbol; + } + else + { + print $html " "; + } + } + print $html "</div> <i>← potentially related commits</i>\n"; + + if (@symbuilds) + { + print $html "\n"; + foreach my $symbuild (@symbuilds) + { + my $first = 1; + my ($symbol, $build) = @$symbuild; + my $buildcommits = $test->{commits}->{$build->{name}}; + foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) + { + print $html $first ? "$symbol." : " "; + $first = undef; + printf $html " <a href='%s/commitdiff/%s' title='%s'>%s</a>\n", $gitweb, $commit->{id}, short_date($build->{date}), $commit->{summary}; + } + } + } +} + sub write_pattern($$$) { my ($html, $test, $pagereports) = @_; @@ -843,6 +978,7 @@ sub write_pattern($$$) next if (!$test->{testreports}->{$reportdir}->{failed}); write_pattern_line($html, $test, $reportdir); } + write_commits($html, $test) if (%{$test->{commits}}); } sub write_patterns_list($$$$) @@ -917,6 +1053,7 @@ EOF { my $test = $tests{$testname}; $test->{colors} = {}; + $test->{commits} = {}; my $first = @sortedbuilds; my $last = -1; @@ -965,6 +1102,12 @@ EOF %{$test->{newmodes}} ? "newmode" : "regular"; push @{$lists{$listid}->{testnames}}, $testname; + + foreach my $commit (values %{$path2commits{$test->{source}}}) + { + my $buildname = $commit->{build}->{name}; + $test->{commits}->{$buildname}->{$commit->{id}} = $commit; + } } # Generate the lists index (and up test unit links)

1 0

Francois Gouget : winetest/build-patterns: Store an 'is wine' flag in the report structure.
by Alexandre Julliard 06 May '21

06 May '21

Module: tools Branch: master Commit: c3e23ab6e1c1a2fac56d0795dc51fac21f6f4499 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c3e23ab6e1c1a2fac56d079… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 6 14:21:56 2021 +0200 winetest/build-patterns: Store an 'is wine' flag in the report structure. This groups all the tag parsing aspects in one place and is useful to check if a pattern contains Wine reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a5f98f5..d16050d 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -322,12 +322,14 @@ foreach my $build (@sortedbuilds) if (!$report) { my ($platform, $tag, $num) = split /_/, $reportdir; + my $is_wine = ($platform =~ /^(?:linux|mac|bsd|solaris|wine)$/); $report = { dir => $reportdir, platform => $platform, tag => $tag, num => $num, is_rerun => ($num ? 1 : 0), + is_wine => $is_wine, }; $reports{$reportdir} = $report; } @@ -1028,7 +1030,7 @@ foreach my $report (values %reports) } # Windows and Wine have different failure modes so put them on separate # pages. - my $page = ($report->{platform} =~ /^(?:linux|mac|bsd|solaris|wine)$/) ? "wine" : "win"; + my $page = $report->{is_wine} ? "wine" : "win"; $tbreports{$page}->{$report->{dir}} = 1; }

1 0

Rémi Bernon : user32: Factor GetKeyboardLayout and remove driver call.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: e2aa30f21def839866b09e74b5ddd843f7e70c87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2aa30f21def839866b09e74… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 5 11:46:51 2021 +0200 user32: Factor GetKeyboardLayout and remove driver call. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 ------------- dlls/user32/input.c | 9 ++++++--- dlls/user32/user_private.h | 1 - dlls/winemac.drv/keyboard.c | 16 +--------------- dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/keyboard.c | 27 ++++----------------------- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 1 - 8 files changed, 11 insertions(+), 58 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index daba4bb7c01..c213f6ecb10 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -108,7 +108,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ActivateKeyboardLayout); GET_USER_FUNC(Beep); GET_USER_FUNC(GetKeyNameText); - GET_USER_FUNC(GetKeyboardLayout); GET_USER_FUNC(GetKeyboardLayoutList); GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); @@ -206,11 +205,6 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) return -1; /* use default implementation */ } -static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) -{ - return (HKL)~0; /* use default implementation */ -} - static BOOL CDECL nulldrv_GetKeyboardLayoutName( LPWSTR name ) { return FALSE; @@ -427,7 +421,6 @@ static USER_DRIVER null_driver = nulldrv_ActivateKeyboardLayout, nulldrv_Beep, nulldrv_GetKeyNameText, - nulldrv_GetKeyboardLayout, nulldrv_GetKeyboardLayoutList, nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, @@ -502,11 +495,6 @@ static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size return load_driver()->pGetKeyNameText( lparam, buffer, size ); } -static HKL CDECL loaderdrv_GetKeyboardLayout( DWORD thread_id ) -{ - return load_driver()->pGetKeyboardLayout( thread_id ); -} - static UINT CDECL loaderdrv_GetKeyboardLayoutList( INT size, HKL *layouts ) { return load_driver()->pGetKeyboardLayoutList( size, layouts ); @@ -642,7 +630,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_ActivateKeyboardLayout, loaderdrv_Beep, loaderdrv_GetKeyNameText, - loaderdrv_GetKeyboardLayout, loaderdrv_GetKeyboardLayoutList, loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8436347b0b0..bebdc3e012b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1083,11 +1083,14 @@ UINT WINAPI GetKBCodePage(void) */ HKL WINAPI GetKeyboardLayout(DWORD thread_id) { - HKL layout; + struct user_thread_info *thread = get_user_thread_info(); + HKL layout = thread->kbd_layout; - if ((layout = USER_Driver->pGetKeyboardLayout( thread_id )) != (HKL)~0) return layout; + if (thread_id && thread_id != GetCurrentThreadId()) + FIXME( "couldn't return keyboard layout for thread %04x\n", thread_id ); - return get_locale_kbd_layout(); + if (!layout) return get_locale_kbd_layout(); + return layout; } /**************************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e568054165a..48aea824351 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -65,7 +65,6 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pActivateKeyboardLayout)(HKL, UINT); void (CDECL *pBeep)(void); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); - HKL (CDECL *pGetKeyboardLayout)(DWORD); UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); BOOL (CDECL *pGetKeyboardLayoutName)(LPWSTR); HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 300bc84d664..bdf01e115a0 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -395,8 +395,6 @@ static const struct { { VK_VOLUME_UP | 0x100, "Volume Up" }, }; -HKL CDECL macdrv_GetKeyboardLayout(DWORD); - static BOOL char_matches_string(WCHAR wchar, UniChar *string, BOOL ignore_diacritics) { BOOL ret; @@ -1298,18 +1296,6 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) } -/*********************************************************************** - * GetKeyboardLayout (MACDRV.@) - */ -HKL CDECL macdrv_GetKeyboardLayout(DWORD thread_id) -{ - if (thread_id && thread_id != GetCurrentThreadId()) - FIXME("couldn't return keyboard layout for thread %04x\n", thread_id); - - return macdrv_init_thread_data()->active_keyboard_layout; -} - - /*********************************************************************** * GetKeyboardLayoutList (MACDRV.@) */ @@ -1349,7 +1335,7 @@ BOOL CDECL macdrv_GetKeyboardLayoutName(LPWSTR name) static const WCHAR formatW[] = {'%','0','8','x',0}; DWORD layout; - layout = HandleToUlong(macdrv_GetKeyboardLayout(0)); + layout = HandleToUlong(GetKeyboardLayout(0)); if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); sprintfW(name, formatW, layout); TRACE("returning %s\n", debugstr_w(name)); diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 39cf33370b4..18efd03319c 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -14,7 +14,6 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos -@ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutList(long ptr) macdrv_GetKeyboardLayoutList @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 228dba0f8b2..ce10f6ee1a3 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1889,23 +1889,6 @@ static BOOL match_x11_keyboard_layout(HKL hkl) } -/*********************************************************************** - * GetKeyboardLayout (X11DRV.@) - */ -HKL CDECL X11DRV_GetKeyboardLayout(DWORD dwThreadid) -{ - if (!dwThreadid || dwThreadid == GetCurrentThreadId()) - { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data && thread_data->kbd_layout) return thread_data->kbd_layout; - } - else - FIXME("couldn't return keyboard layout for thread %04x\n", dwThreadid); - - return get_locale_kbd_layout(); -} - - /*********************************************************************** * LoadKeyboardLayout (X11DRV.@) */ @@ -1932,9 +1915,8 @@ BOOL CDECL X11DRV_UnloadKeyboardLayout(HKL hkl) */ BOOL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) { - struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); - FIXME("%p, %04x: semi-stub!\n", hkl, flags); + if (flags & KLF_SETFORPROCESS) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1949,7 +1931,6 @@ BOOL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) return FALSE; } - thread_data->kbd_layout = hkl; return TRUE; } @@ -1967,7 +1948,7 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event ) hwnd = GetFocus(); if (!hwnd) hwnd = GetActiveWindow(); PostMessageW(hwnd, WM_INPUTLANGCHANGEREQUEST, - 0 /*FIXME*/, (LPARAM)X11DRV_GetKeyboardLayout(0)); + 0 /*FIXME*/, (LPARAM)GetKeyboardLayout(0)); return TRUE; } @@ -2215,7 +2196,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) scanCode = lParam >> 16; scanCode &= 0x1ff; /* keep "extended-key" flag with code */ - vkey = X11DRV_MapVirtualKeyEx(scanCode, MAPVK_VSC_TO_VK_EX, X11DRV_GetKeyboardLayout(0)); + vkey = X11DRV_MapVirtualKeyEx(scanCode, MAPVK_VSC_TO_VK_EX, GetKeyboardLayout(0)); /* handle "don't care" bit (0x02000000) */ if (!(lParam & 0x02000000)) { @@ -2238,7 +2219,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) } } - ansi = X11DRV_MapVirtualKeyEx(vkey, MAPVK_VK_TO_CHAR, X11DRV_GetKeyboardLayout(0)); + ansi = X11DRV_MapVirtualKeyEx(vkey, MAPVK_VK_TO_CHAR, GetKeyboardLayout(0)); TRACE("scan 0x%04x, vkey 0x%04X, ANSI 0x%04x\n", scanCode, vkey, ansi); /* first get the name of the "regular" keys which is the Upper case diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index c0e24d8fe82..809105f3b4f 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -7,7 +7,6 @@ @ cdecl ActivateKeyboardLayout(long long) X11DRV_ActivateKeyboardLayout @ cdecl Beep() X11DRV_Beep @ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText -@ cdecl GetKeyboardLayout(long) X11DRV_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName @ cdecl LoadKeyboardLayout(wstr long) X11DRV_LoadKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) X11DRV_MapVirtualKeyEx diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2362dfd9563..c23cd512eb9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -337,7 +337,6 @@ struct x11drv_thread_data Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */ - HKL kbd_layout; /* active keyboard layout */ enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count;

1 0

Rémi Bernon : user32: Factor ActivateKeyboardLayout previous layout logic.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: da9fc4181476c8ff186cfd5cc737a84f0232fa6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9fc4181476c8ff186cfd5c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 5 11:46:50 2021 +0200 user32: Factor ActivateKeyboardLayout previous layout logic. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 6 +++--- dlls/user32/input.c | 13 +++++++------ dlls/user32/user_private.h | 2 +- dlls/winemac.drv/keyboard.c | 10 +++++----- dlls/winex11.drv/keyboard.c | 13 ++++--------- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index efaa04db096..daba4bb7c01 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -187,9 +187,9 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) +static BOOL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { - return (HKL)~0; /* use default implementation */ + return TRUE; } static void CDECL nulldrv_Beep(void) @@ -487,7 +487,7 @@ static USER_DRIVER null_driver = * Each entry point simply loads the real driver and chains to it. */ -static HKL CDECL loaderdrv_ActivateKeyboardLayout( HKL layout, UINT flags ) +static BOOL CDECL loaderdrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return load_driver()->pActivateKeyboardLayout( layout, flags ); } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8e5ab91baf3..8436347b0b0 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1330,13 +1330,14 @@ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) return 0; } - if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0) - { - if (old_layout) info->kbd_layout = layout; - return old_layout; - } + if (!USER_Driver->pActivateKeyboardLayout( layout, flags )) + return 0; - return get_locale_kbd_layout(); + old_layout = info->kbd_layout; + info->kbd_layout = layout; + + if (!old_layout) return get_locale_kbd_layout(); + return old_layout; } /********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7ac65a34db3..e568054165a 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -62,7 +62,7 @@ enum wine_internal_message typedef struct tagUSER_DRIVER { /* keyboard functions */ - HKL (CDECL *pActivateKeyboardLayout)(HKL, UINT); + BOOL (CDECL *pActivateKeyboardLayout)(HKL, UINT); void (CDECL *pBeep)(void); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); HKL (CDECL *pGetKeyboardLayout)(DWORD); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 0648b00a4f1..300bc84d664 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1163,16 +1163,16 @@ void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke /*********************************************************************** * ActivateKeyboardLayout (MACDRV.@) */ -HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) +BOOL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) { - HKL oldHkl = 0; + BOOL ret = FALSE; struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); struct layout *layout; TRACE("hkl %p flags %04x\n", hkl, flags); if (hkl == thread_data->active_keyboard_layout) - return hkl; + return TRUE; EnterCriticalSection(&layout_list_section); update_layout_list(); @@ -1183,7 +1183,7 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) { if (macdrv_select_input_source(layout->input_source)) { - oldHkl = thread_data->active_keyboard_layout; + ret = TRUE; if (thread_data->keyboard_layout_uchr) CFRelease(thread_data->keyboard_layout_uchr); @@ -1199,7 +1199,7 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) } LeaveCriticalSection(&layout_list_section); - return oldHkl; + return ret; } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d583c8588cd..228dba0f8b2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1930,9 +1930,8 @@ BOOL CDECL X11DRV_UnloadKeyboardLayout(HKL hkl) /*********************************************************************** * ActivateKeyboardLayout (X11DRV.@) */ -HKL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) +BOOL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) { - HKL oldHkl = 0; struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); FIXME("%p, %04x: semi-stub!\n", hkl, flags); @@ -1940,22 +1939,18 @@ HKL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); FIXME("KLF_SETFORPROCESS not supported\n"); - return 0; + return FALSE; } if (!match_x11_keyboard_layout(hkl)) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); FIXME("setting keyboard of different locales not supported\n"); - return 0; + return FALSE; } - oldHkl = thread_data->kbd_layout; - if (!oldHkl) oldHkl = get_locale_kbd_layout(); - thread_data->kbd_layout = hkl; - - return oldHkl; + return TRUE; }

1 0

Rémi Bernon : winemac.drv: Call ActivateKeyboardLayout when layout changes.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: db901b91eff6d9a71978eea1c042e9259ad2b945 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db901b91eff6d9a71978eea1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 5 11:46:49 2021 +0200 winemac.drv: Call ActivateKeyboardLayout when layout changes. To update user32 current keyboard layout as well. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/keyboard.c | 5 +++++ dlls/winemac.drv/macdrv_main.c | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 6732c5755ee..0648b00a4f1 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1054,6 +1054,8 @@ void macdrv_keyboard_changed(const macdrv_event *event) macdrv_compute_keyboard_layout(thread_data); + ActivateKeyboardLayout(thread_data->active_keyboard_layout, 0); + SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); } @@ -1169,6 +1171,9 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) TRACE("hkl %p flags %04x\n", hkl, flags); + if (hkl == thread_data->active_keyboard_layout) + return hkl; + EnterCriticalSection(&layout_list_section); update_layout_list(); diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 694a46b11e6..203e993ee93 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -384,6 +384,7 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) set_queue_display_fd(macdrv_get_event_queue_fd(data->queue)); TlsSetValue(thread_data_tls_index, data); + ActivateKeyboardLayout(data->active_keyboard_layout, 0); return data; }

1 0

Rémi Bernon : user32: Add current keyboard layout to thread data.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 179c57603a7fc2c65379e1a054ba006b79fda6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=179c57603a7fc2c65379e1a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 5 11:46:48 2021 +0200 user32: Add current keyboard layout to thread data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 2 ++ dlls/user32/input.c | 4 ++++ dlls/user32/user_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index d00fc8584c6..a3d92e84aef 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -728,8 +728,10 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_INPUTLANGCHANGE: { + struct user_thread_info *info = get_user_thread_info(); int count = 0; HWND *win_array = WIN_ListChildren( hwnd ); + info->kbd_layout = (HKL)lParam; if (!win_array) break; diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1f795e43545..8e5ab91baf3 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1316,6 +1316,7 @@ INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, */ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) { + struct user_thread_info *info = get_user_thread_info(); HKL old_layout; TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); @@ -1330,7 +1331,10 @@ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) } if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0) + { + if (old_layout) info->kbd_layout = layout; return old_layout; + } return get_locale_kbd_layout(); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5f8059a12a0..7ac65a34db3 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -199,6 +199,7 @@ struct user_thread_info DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ struct user_key_state_info *key_state; /* Cache of global key state */ + HKL kbd_layout; /* Current keyboard layout */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */

1 0

Jacek Caban : ntdll: Inherit tty std input and output in processes attached to Unix console.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: fdf568aaaef658de63f94d8f58feb872105f5c7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdf568aaaef658de63f94d8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 5 20:39:00 2021 +0200 ntdll: Inherit tty std input and output in processes attached to Unix console. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50117 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 53 +++++++++++++++++++++++++++++++++------------- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 6 ++++++ 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index ce2033bc0dc..79a4bbce7a8 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -58,7 +58,9 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "winioctl.h" #include "unix_private.h" +#include "wine/condrv.h" #include "wine/exception.h" #include "wine/server.h" #include "wine/debug.h" @@ -387,12 +389,23 @@ static void set_stdio_fd( int stdin_fd, int stdout_fd ) if (stdout_fd == -1) stdout_fd = fd; } - dup2( stdin_fd, 0 ); - dup2( stdout_fd, 1 ); + if (stdin_fd != 0) dup2( stdin_fd, 0 ); + if (stdout_fd != 1) dup2( stdout_fd, 1 ); if (fd != -1) close( fd ); } +/*********************************************************************** + * is_unix_console_handle + */ +static BOOL is_unix_console_handle( HANDLE handle ) +{ + IO_STATUS_BLOCK io; + return !NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_CONDRV_IS_UNIX, + NULL, 0, NULL, 0 ); +} + + /*********************************************************************** * spawn_process */ @@ -404,8 +417,13 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so pid_t pid; char **argv; - wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ); - wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); + if (wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ) && + isatty(0) && is_unix_console_handle( params->hStdInput )) + stdin_fd = 0; + + if (wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ) && + isatty(1) && is_unix_console_handle( params->hStdOutput )) + stdout_fd = 1; if (!(pid = fork())) /* child */ { @@ -420,8 +438,8 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so } else set_stdio_fd( stdin_fd, stdout_fd ); - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); + if (stdin_fd != -1 && stdin_fd != 0) close( stdin_fd ); + if (stdout_fd != -1 && stdout_fd != 1) close( stdout_fd ); if (winedebug) putenv( winedebug ); if (unixdir != -1) @@ -448,8 +466,8 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so } else status = STATUS_NO_MEMORY; - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); + if (stdin_fd != -1 && stdin_fd != 0) close( stdin_fd ); + if (stdout_fd != -1 && stdout_fd != 1) close( stdout_fd ); return status; } @@ -484,8 +502,13 @@ static NTSTATUS fork_and_exec( OBJECT_ATTRIBUTES *attr, int unixdir, fcntl( fd[1], F_SETFD, FD_CLOEXEC ); } - wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ); - wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); + if (wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ) && + isatty(0) && is_unix_console_handle( params->hStdInput )) + stdin_fd = 0; + + if (wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ) && + isatty(1) && is_unix_console_handle( params->hStdOutput )) + stdout_fd = 1; if (!(pid = fork())) /* child */ { @@ -494,7 +517,7 @@ static NTSTATUS fork_and_exec( OBJECT_ATTRIBUTES *attr, int unixdir, close( fd[0] ); if (params->ConsoleFlags || - params->ConsoleHandle == (HANDLE)1 /* KERNEL32_CONSOLE_ALLOC */ || + params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { setsid(); @@ -502,8 +525,8 @@ static NTSTATUS fork_and_exec( OBJECT_ATTRIBUTES *attr, int unixdir, } else set_stdio_fd( stdin_fd, stdout_fd ); - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); + if (stdin_fd != -1 && stdin_fd != 0) close( stdin_fd ); + if (stdout_fd != -1 && stdout_fd != 1) close( stdout_fd ); /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); @@ -550,8 +573,8 @@ static NTSTATUS fork_and_exec( OBJECT_ATTRIBUTES *attr, int unixdir, else status = STATUS_NO_MEMORY; close( fd[0] ); - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); + if (stdin_fd != -1 && stdin_fd != 0) close( stdin_fd ); + if (stdout_fd != -1 && stdout_fd != 1) close( stdout_fd ); done: free( unix_name ); return status; diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 5c3c550070d..add08be20c8 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -27,6 +27,7 @@ /* common console input and output ioctls */ #define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_IS_UNIX CTL_CODE(FILE_DEVICE_CONSOLE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console input ioctls */ #define IOCTL_CONDRV_READ_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index f83528cb5f6..dd423ee5491 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2375,6 +2375,9 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_IS_UNIX: + return screen_buffer->console->is_unix ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED; + case IOCTL_CONDRV_WRITE_CONSOLE: if (in_size % sizeof(WCHAR) || *out_size) return STATUS_INVALID_PARAMETER; return write_console( screen_buffer, in_data, in_size / sizeof(WCHAR) ); @@ -2452,6 +2455,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set %x mode\n", console->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_IS_UNIX: + return console->is_unix ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED; + case IOCTL_CONDRV_READ_CONSOLE: if (in_size || *out_size % sizeof(WCHAR)) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console );

1 0

Arkadiusz Hiler : ucrtbase: Add invalid param tests for _beginthread[ex]().
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 7856fec19ed324f9ab950e27bcf6a6c7f0d0a326 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7856fec19ed324f9ab950e27… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 5 13:03:14 2021 +0300 ucrtbase: Add invalid param tests for _beginthread[ex](). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/thread.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 01f46029c06..512d2158b66 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -132,6 +132,39 @@ static void test_thread_library_reference(char *thread_dll, CloseHandle(detach_event); } +static BOOL handler_called; + +void CDECL test_invalid_parameter_handler(const wchar_t *expression, + const wchar_t *function_name, + const wchar_t *file_name, + unsigned line_number, + uintptr_t reserved) +{ + handler_called = TRUE; +} + +static void test_thread_invalid_params(void) +{ + uintptr_t hThread; + _invalid_parameter_handler old = _set_invalid_parameter_handler(test_invalid_parameter_handler); + + errno = 0; + handler_called = FALSE; + hThread = _beginthreadex(NULL, 0, NULL, NULL, 0, NULL); + ok(hThread == 0, "_beginthreadex unexpected ret: %d\n", hThread); + ok(errno == EINVAL, "_beginthreadex unexpected errno: %d\n", errno); + ok(handler_called, "Expected invalid_parameter_handler to be called\n"); + + errno = 0; + handler_called = FALSE; + hThread = _beginthread(NULL, 0, NULL); + ok(hThread == -1, "_beginthread unexpected ret: %d\n", hThread); + ok(errno == EINVAL, "_beginthread unexpected errno: %d\n", errno); + ok(handler_called, "Expected invalid_parameter_handler to be called\n"); + + _set_invalid_parameter_handler(old); +} + START_TEST(thread) { BOOL ret; @@ -144,4 +177,6 @@ START_TEST(thread) ret = DeleteFileA(thread_dll); ok(ret, "Failed to remove the test dll, err: %u", GetLastError()); + + test_thread_invalid_params(); }

1 0

Arkadiusz Hiler : ucrtbase: Add tests for _beginthread[ex]().
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: f80ac265e5fbd1b4c0c0c346f0cc232385a8f868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f80ac265e5fbd1b4c0c0c346… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 5 13:03:13 2021 +0300 ucrtbase: Add tests for _beginthread[ex](). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 7 +- dlls/ucrtbase/tests/thread.c | 147 +++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/tests/threaddll.c | 67 +++++++++++++++++ dlls/ucrtbase/tests/threaddll.h | 30 ++++++++ dlls/ucrtbase/tests/threaddll.spec | 3 + 5 files changed, 252 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 259880a7d90..4df5684290c 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -2,9 +2,12 @@ TESTDLL = ucrtbase.dll IMPORTS = ucrtbase EXTRADEFS = -fno-builtin -C_SRCS = \ +SOURCES = \ cpp.c \ misc.c \ printf.c \ scanf.c \ - string.c + string.c \ + thread.c \ + threaddll.c \ + threaddll.spec diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c new file mode 100644 index 00000000000..01f46029c06 --- /dev/null +++ b/dlls/ucrtbase/tests/thread.c @@ -0,0 +1,147 @@ +/* + * Copyright 2021 Arkadiusz Hiler for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <errno.h> +#include <stdarg.h> +#include <process.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +#include "threaddll.h" + +enum beginthread_method +{ + use_beginthread, + use_beginthreadex +}; + +static char *get_thread_dll_path(void) +{ + static char path[MAX_PATH]; + const char dll_name[] = "threaddll.dll"; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathA(ARRAY_SIZE(path), path); + strcat(path, dll_name); + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s: %u.\n", + debugstr_a(path), GetLastError()); + + res = FindResourceA(NULL, dll_name, "TESTDLL"); + ok(!!res, "Failed to load resource: %u\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource\n"); + CloseHandle(file); + + return path; +} + +static void set_thead_dll_detach_event(HANDLE dll, HANDLE event) +{ + void WINAPI (*_set_detach_event)(HANDLE event); + _set_detach_event = (void*) GetProcAddress(dll, "set_detach_event"); + ok(_set_detach_event != NULL, "Failed to get set_detach_event: %u\n", GetLastError()); + _set_detach_event(event); +} + +static void test_thread_library_reference(char *thread_dll, + enum beginthread_method beginthread_method, + enum thread_exit_method exit_method) +{ + HANDLE detach_event; + HMODULE dll; + DWORD ret; + uintptr_t thread_handle; + struct threaddll_args args; + + args.exit_method = exit_method; + + detach_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(detach_event != NULL, "Failed to create an event: %u\n", GetLastError()); + args.confirm_running = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(args.confirm_running != NULL, "Failed to create an event: %u\n", GetLastError()); + args.past_free = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(args.past_free != NULL, "Failed to create an event: %u\n", GetLastError()); + + dll = LoadLibraryA(thread_dll); + ok(dll != NULL, "Failed to load the test dll: %u\n", GetLastError()); + + set_thead_dll_detach_event(dll, detach_event); + + if (beginthread_method == use_beginthreadex) + { + _beginthreadex_start_routine_t proc = (void*) GetProcAddress(dll, "stdcall_thread_proc"); + ok(proc != NULL, "Failed to get stdcall_thread_proc: %u\n", GetLastError()); + thread_handle = _beginthreadex(NULL, 0, proc, &args, 0, NULL); + } + else + { + _beginthread_start_routine_t proc = (void*) GetProcAddress(dll, "cdecl_thread_proc"); + ok(proc != NULL, "Failed to get stdcall_thread_proc: %u\n", GetLastError()); + thread_handle = _beginthread(proc, 0, &args); + } + + ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); + + ret = WaitForSingleObject(args.confirm_running, 200); + ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); + + ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + + ret = WaitForSingleObject(detach_event, 0); + ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError()); + + ok(SetEvent(args.past_free), "Failed to signal event: %d\n", GetLastError()); + + if (beginthread_method == use_beginthreadex) + { + ret = WaitForSingleObject((HANDLE)thread_handle, 200); + ok(ret == WAIT_OBJECT_0, "Thread has not exited, ret: %d, err: %u\n", ret, GetLastError()); + } + + ret = WaitForSingleObject(detach_event, 200); + ok(ret == WAIT_OBJECT_0, "Detach event was not signaled, ret: %d, err: %u\n", ret, GetLastError()); + + if (beginthread_method == use_beginthreadex) + CloseHandle((HANDLE)thread_handle); + + CloseHandle(args.past_free); + CloseHandle(args.confirm_running); + CloseHandle(detach_event); +} + +START_TEST(thread) +{ + BOOL ret; + char *thread_dll = get_thread_dll_path(); + + test_thread_library_reference(thread_dll, use_beginthread, thread_exit_return); + test_thread_library_reference(thread_dll, use_beginthread, thread_exit_endthread); + test_thread_library_reference(thread_dll, use_beginthreadex, thread_exit_return); + test_thread_library_reference(thread_dll, use_beginthreadex, thread_exit_endthreadex); + + ret = DeleteFileA(thread_dll); + ok(ret, "Failed to remove the test dll, err: %u", GetLastError()); +} diff --git a/dlls/ucrtbase/tests/threaddll.c b/dlls/ucrtbase/tests/threaddll.c new file mode 100644 index 00000000000..72b8074054a --- /dev/null +++ b/dlls/ucrtbase/tests/threaddll.c @@ -0,0 +1,67 @@ +/* + * Copyright 2021 Arkadiusz Hiler for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> + +#include "threaddll.h" + +static HANDLE detach_event; + +void CDECL _endthread(void); +void CDECL _endthreadex(unsigned int); + +void WINAPI set_detach_event(HANDLE event) +{ + detach_event = event; +} + +static unsigned internal_thread_proc(void *param) +{ + struct threaddll_args *args = param; + SetEvent(args->confirm_running); + WaitForSingleObject(args->past_free, INFINITE); + + if (args->exit_method == thread_exit_endthread) + _endthread(); + else if (args->exit_method == thread_exit_endthreadex) + _endthreadex(0); + + return 0; +} + +unsigned WINAPI stdcall_thread_proc(void *param) +{ + return internal_thread_proc(param); +} + +void CDECL cdecl_thread_proc(void *param) +{ + internal_thread_proc(param); +} + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_DETACH: + if (detach_event) SetEvent(detach_event); + break; + } + + return TRUE; +} diff --git a/dlls/ucrtbase/tests/threaddll.h b/dlls/ucrtbase/tests/threaddll.h new file mode 100644 index 00000000000..1d8d085798f --- /dev/null +++ b/dlls/ucrtbase/tests/threaddll.h @@ -0,0 +1,30 @@ +/* + * Copyright 2021 Arkadiusz Hiler for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +enum thread_exit_method { + thread_exit_return, + thread_exit_endthread, + thread_exit_endthreadex +}; + +struct threaddll_args +{ + HANDLE confirm_running; + HANDLE past_free; + enum thread_exit_method exit_method; +}; diff --git a/dlls/ucrtbase/tests/threaddll.spec b/dlls/ucrtbase/tests/threaddll.spec new file mode 100644 index 00000000000..8422c096946 --- /dev/null +++ b/dlls/ucrtbase/tests/threaddll.spec @@ -0,0 +1,3 @@ +@ stdcall set_detach_event(ptr) +@ stdcall stdcall_thread_proc(ptr) +@ cdecl cdecl_thread_proc(ptr)

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
77
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 May 2021