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

Francois Gouget : testbot/web: Don' t hardcode the Submit.pl maximum filename length.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: ec9869f683ab32313102d7cccfc39e4e3a62db89 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ec9869f683ab32313102d7c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 11:00:01 2018 +0200 testbot/web: Don't hardcode the Submit.pl maximum filename length. Also check it before even starting the upload. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index cf85078..6451745 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -33,9 +33,10 @@ use File::Basename; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Branches; use WineTestBot::Config; -use WineTestBot::Jobs; use WineTestBot::Engine::Notify; +use WineTestBot::Jobs; use WineTestBot::PatchUtils; +use WineTestBot::Steps; use WineTestBot::Utils; use WineTestBot::VMs; @@ -609,10 +610,11 @@ sub OnPage1Next($) $FileName =~ m/^.*(\\|\/)(.*)/; $FileName = $2; } - if (100 - 32 - 1 < length($FileName)) + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) { $self->{ErrField} = "File"; - $self->{ErrMessage} = "File: Name is too long"; + $self->{ErrMessage} = "The filename is too long"; return !1; } my $StagingFile = $self->GetTmpStagingFullPath($FileName);

1 0

Francois Gouget : testbot/web: Remove pointless 'cleanup' Submit.pl code.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: bad586dd56194fd577fb5426a5d5c0273b7b614f URL: https://source.winehq.org/git/tools.git/?a=commit;h=bad586dd56194fd577fb542… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 11:00:20 2018 +0200 testbot/web: Remove pointless 'cleanup' Submit.pl code. Objects are freed when they get out of scope. So there is no point setting $Jobs to undef. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 6451745..3c62c7f 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -873,21 +873,17 @@ sub OnSubmit($) return !1; } - # Clean up, but save the key of the new job - my $JobKey = $NewJob->GetKey(); - $Jobs = undef; - # Notify engine my $ErrMessage = RescheduleJobs(); if (defined $ErrMessage) { $self->{ErrMessage} = $ErrMessage; $self->{Page} = 4; - $self->{JobKey} = $JobKey; + $self->{JobKey} = $NewJob->GetKey(); return !1; } - $self->Redirect("/JobDetails.pl?Key=$JobKey"); # does not return + $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return exit; }

1 0

Francois Gouget : testbot: Update the Job, Step and Task documentation.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: e35b3d03ed6d24f143fbe44fbef7344c87e0312a URL: https://source.winehq.org/git/tools.git/?a=commit;h=e35b3d03ed6d24f143fbe44… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 11:00:29 2018 +0200 testbot: Update the Job, Step and Task documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 24 +++++++++++++++++++++--- testbot/lib/WineTestBot/Steps.pm | 33 ++++++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Tasks.pm | 31 +++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ef0d98e..b1ffd3e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -28,13 +28,14 @@ WineTestBot::Job - A job submitted by a user =head1 DESCRIPTION A Job is created when a WineTestBot::User asks for something to be tested -(for automatically generated Jobs this would be the batch user). There are many +(for automatically generated Jobs this would be the batch user). A Job is +composed of one or more WineTestBot::Step objects. There are many paths that can result in the creation of a job: =over =item * -A use submits a patch or binary to test. +A user submits a patch or binary to test. =item * WineTestBot finds a patch to test on the mailing list (and has all the pieces @@ -47,7 +48,24 @@ Job. =back -A Job is composed of multiple WineTestBot::Step objects. +A Job's lifecycle is as follows: +=over + +=item * +A Job is created with Status set to queued which means it is ready to run. + +=item * +As soon as one of the Step starts running, the Job's Status field is set to +running. + +=item * +Once all the Steps have completed the Job's Status is updated to reflect the +overall result: completed, badpatch, etc. + +=item * +If the Job is canceled by the user, then the Status field is set to canceled. + +=back =cut diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 635092d..4dc4569 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -26,9 +26,36 @@ WineTestBot::Step - A Job's Step =head1 DESCRIPTION -A Job is composed of multiple Steps that each do a specific operation: build -the test executable, or run a given test, etc. A Step is in turn composed of -a WineTestBot::Task object for each VM it should be run on. +A Job is composed of one or more Steps that each perform one operation. A +Step is in turn composed of one WineTestBot::Task object for each VM that the +Step should be run on. + +A Step's lifecyle is as follows: +=over + +=item * +A Step is created with Status set to queued which means it is ready to be run +as soon as the PreviousNo Step has completed, or immediately if PreviousNo is +not set. + +=item * +Once one of the Step's Task is running the Step's Status is changed to +running. + +=item * +Once all the Tasks in the Step have completed, the Step's Status is set to one +of the "completion" Status values according to the overall success of its +Tasks: completed, badpatch, etc. + +=item * +If the PreviousNo Step failed then the Status field and that of all its Tasks +is set to skip; and the Step will not be run. + +=item * +If a Step is canceled by the user, then the Status field is set to canceled if +the Step was running, and to skipped if it was queued. + +=back Note that the PreviousNo relation will prevent the deletion of the target Step. It is the responsibility of the caller to delete the Steps in a suitable order, diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 69d551b..afd4fb4 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -31,6 +31,37 @@ performing that Step in a WineTestBot::VM virtual machine. For instance a Step responsible for running a given test would have one Task object for each virtual machine that the test must be performed in. +A Task's lifecyle is as follows: +=over + +=item * +A Task is created with Status set to queued which means it is ready to be run +as soon as long as the Step itself is runnable (see the WineTestBot::Step +documentation). + +=item * +Once the Task is running on the corresponding VM the Status field is set to +running. + +=item * +If running the Task fails due to a transient error the TestFailure field +is checked. If it is lower than a configurable threshold the Status is +reset to queued and the TestFailure field is incremented. Otherwise the +Status is set to boterror and the Task is considered to have completed. + +=item * +If the Task completes normally the Status field is set to the appropriate +value based on the result: completed, badpatch, etc. + +=item * +If the Task is canceled by the user its Status is set to canceled. + +=item * +If the Task's Step cannot be run because the Step it depends on failed, then +Status is set to skipped. + +=back + =cut use WineTestBot::WineTestBotObjects;

1 0

Francois Gouget : testbot/web: Move some Submit.pl variables closer to the usage.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: 1245d92eccdfe2ef0c5e94ffb27306b4687f866a URL: https://source.winehq.org/git/tools.git/?a=commit;h=1245d92eccdfe2ef0c5e94f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 11:00:33 2018 +0200 testbot/web: Move some Submit.pl variables closer to the usage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3c62c7f..2a4521e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -509,15 +509,12 @@ sub DetermineFileType($$) { my ($self, $FileName) = @_; - my $ErrMessage = undef; - my $FileType = "unknown"; - my $DllBaseName = undef; - my $TestUnit = undef; if (! sysopen(FH, $FileName, O_RDONLY)) { return ("Unable to open $FileName", "unknown", undef, undef); } + my $FileType = "unknown"; my $Buffer; if (sysread(FH, $Buffer, 0x40)) { @@ -563,6 +560,7 @@ sub DetermineFileType($$) close FH; + my ($ErrMessage, $DllBaseName, $TestUnit); if ($FileType eq "unknown") { my $Impacts = GetPatchImpact($FileName);

1 0

Francois Gouget : testbot: Fix the "Set doesn't affect tests" message.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: 004b1384aae737b10ab8cb4d36324d3be7d75dd2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=004b1384aae737b10ab8cb4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 10:04:32 2018 +0200 testbot: Fix the "Set doesn't affect tests" message. There is no need to rerun the tests for part N of a patch set if it does not impact the tests: the results would be the same as those already obtained from the combined part 1 .. part N patch. So adjust the message to better convey this. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 71d735b..d5be1b3 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -137,7 +137,7 @@ sub Submit($$$) my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { - $self->Disposition(($IsSet ? "Set" : "Patch") . + $self->Disposition(($IsSet ? "Part" : "Patch") . " doesn't affect tests"); return undef; }

1 0

Józef Kucia : dxgi: Forbid multisampling with flip swap effects.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 79a189b9adb11ee63ef7a2401ae1c7a3ad769d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=79a189b9adb11ee63ef7a240… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:34 2018 +0200 dxgi: Forbid multisampling with flip swap effects. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 57ce3e1..cc9075a 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -246,7 +246,7 @@ static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IWineDXGIFact } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFactory *iface, - IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { @@ -255,23 +255,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa IWineDXGIDevice *dxgi_device; HRESULT hr; - TRACE("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p.\n", - iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); + TRACE("iface %p, device %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", + iface, device, window, desc, fullscreen_desc, output, swapchain); - if (!device || !window || !swapchain_desc || !swapchain) + if (!device || !window || !desc || !swapchain) { WARN("Invalid pointer.\n"); return DXGI_ERROR_INVALID_CALL; } - if (swapchain_desc->Stereo) + if (desc->Stereo) { FIXME("Stereo swapchains are not supported.\n"); return DXGI_ERROR_UNSUPPORTED; } - switch (swapchain_desc->SwapEffect) + switch (desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: case DXGI_SWAP_EFFECT_SEQUENTIAL: @@ -281,16 +280,23 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa case DXGI_SWAP_EFFECT_FLIP_DISCARD: case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; + + if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) + { + WARN("Invalid sample desc %u, %u for swap effect %#x.\n", + desc->SampleDesc.Count, desc->SampleDesc.Quality, desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } break; default: - WARN("Invalid swap effect %u used.\n", swapchain_desc->SwapEffect); + WARN("Invalid swap effect %u used.\n", desc->SwapEffect); return DXGI_ERROR_INVALID_CALL; } - if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) + if (desc->BufferCount < min_buffer_count || desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) { - WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); + WARN("BufferCount is %u.\n", desc->BufferCount); return DXGI_ERROR_INVALID_CALL; } @@ -299,14 +305,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { - hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain); + hr = d3d11_swapchain_create(dxgi_device, window, desc, fullscreen_desc, swapchain); IWineDXGIDevice_Release(dxgi_device); return hr; } if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_ID3D12CommandQueue, (void **)&command_queue))) { - hr = d3d12_swapchain_create(iface, command_queue, window, swapchain_desc, fullscreen_desc, swapchain); + hr = d3d12_swapchain_create(iface, command_queue, window, desc, fullscreen_desc, swapchain); ID3D12CommandQueue_Release(command_queue); return hr; }

1 0

Józef Kucia : dxgi: Introduce ARRAY_SIZE() macro.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: c377644ca7a5eaf48d19d0e5c08dd715a3422ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c377644ca7a5eaf48d19d0e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:35 2018 +0200 dxgi: Introduce ARRAY_SIZE() macro. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 547bd19..c8dc67f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -40,6 +40,8 @@ #include "wine/wined3d.h" #include "wine/winedxgi.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + enum dxgi_frame_latency { DXGI_FRAME_LATENCY_DEFAULT = 3, diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 063ec5a..73c3cf2 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -655,7 +655,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion); for (i = 0; i < level_count; ++i) { - for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j) + for (j = 0; j < ARRAY_SIZE(feature_levels_sm); ++j) { if (feature_levels[i] == feature_levels_sm[j].feature_level) { @@ -671,7 +671,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, if (selected_feature_level) break; - if (j == sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0])) + if (j == ARRAY_SIZE(feature_levels_sm)) FIXME("Unexpected feature level %#x.\n", feature_levels[i]); else TRACE("Feature level %s not supported, trying next fallback if available.\n",

1 0

Józef Kucia : dxgi/tests: Release IDXGIFactory in test_swapchain_present().
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 430346447543d9ceed9bdcb32b8290a14ce619fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=430346447543d9ceed9bdcb3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:40 2018 +0200 dxgi/tests: Release IDXGIFactory in test_swapchain_present(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d9ffa50..c192992 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3427,6 +3427,8 @@ static void test_swapchain_present(void) refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); } static void test_maximum_frame_latency(void)

1 0

Zebediah Figura : kernel32: Allow EnumProcessModules() to succeed on a WoW64 process.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 54186a4c9f307fb59b9fe60042fe08af8de0bda4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54186a4c9f307fb59b9fe600… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 09:33:03 2018 -0500 kernel32: Allow EnumProcessModules() to succeed on a WoW64 process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 91 ++++++++++++++++++++++++++++++++++++++++++- dlls/psapi/tests/Makefile.in | 1 + dlls/psapi/tests/psapi_main.c | 67 +++++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 6f123ca..ac1f45f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1493,10 +1493,56 @@ FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ) return NULL; } +typedef struct _PEB32 +{ + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; + BOOLEAN SpareBool; + DWORD Mutant; + DWORD ImageBaseAddress; + DWORD LdrData; +} PEB32; + +typedef struct _LIST_ENTRY32 +{ + DWORD Flink; + DWORD Blink; +} LIST_ENTRY32; + +typedef struct _PEB_LDR_DATA32 +{ + ULONG Length; + BOOLEAN Initialized; + DWORD SsHandle; + LIST_ENTRY32 InLoadOrderModuleList; +} PEB_LDR_DATA32; + +typedef struct _UNICODE_STRING32 +{ + USHORT Length; + USHORT MaximumLength; + DWORD Buffer; +} UNICODE_STRING32; + +typedef struct _LDR_MODULE32 +{ + LIST_ENTRY32 InLoadOrderModuleList; + LIST_ENTRY32 InMemoryOrderModuleList; + LIST_ENTRY32 InInitializationOrderModuleList; + DWORD BaseAddress; + DWORD EntryPoint; + ULONG SizeOfImage; + UNICODE_STRING32 FullDllName; + UNICODE_STRING32 BaseDllName; +} LDR_MODULE32; + typedef struct { HANDLE process; PLIST_ENTRY head, current; LDR_MODULE ldr_module; + BOOL wow64; + LDR_MODULE32 ldr_module32; } MODULE_ITERATOR; static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) @@ -1505,6 +1551,9 @@ static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) PPEB_LDR_DATA ldr_data; NTSTATUS status; + if (!IsWow64Process(process, &iter->wow64)) + return FALSE; + /* Get address of PEB */ status = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); @@ -1514,6 +1563,30 @@ static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) return FALSE; } + if (sizeof(void *) == 8 && iter->wow64) + { + PEB_LDR_DATA32 *ldr_data32_ptr; + DWORD ldr_data32, first_module; + PEB32 *peb32; + + peb32 = (PEB32 *)(DWORD_PTR)pbi.PebBaseAddress; + + if (!ReadProcessMemory(process, &peb32->LdrData, &ldr_data32, + sizeof(ldr_data32), NULL)) + return FALSE; + ldr_data32_ptr = (PEB_LDR_DATA32 *)(DWORD_PTR) ldr_data32; + + if (!ReadProcessMemory(process, + &ldr_data32_ptr->InLoadOrderModuleList.Flink, + &first_module, sizeof(first_module), NULL)) + return FALSE; + iter->head = (LIST_ENTRY *)&ldr_data32_ptr->InLoadOrderModuleList; + iter->current = (LIST_ENTRY *)(DWORD_PTR) first_module; + iter->process = process; + + return TRUE; + } + /* Read address of LdrData from PEB */ if (!ReadProcessMemory(process, &pbi.PebBaseAddress->LdrData, &ldr_data, sizeof(ldr_data), NULL)) @@ -1536,6 +1609,19 @@ static int module_iterator_next(MODULE_ITERATOR *iter) if (iter->current == iter->head) return 0; + if (sizeof(void *) == 8 && iter->wow64) + { + LIST_ENTRY32 *entry32 = (LIST_ENTRY32 *)iter->current; + + if (!ReadProcessMemory(iter->process, + CONTAINING_RECORD(entry32, LDR_MODULE32, InLoadOrderModuleList), + &iter->ldr_module32, sizeof(iter->ldr_module32), NULL)) + return -1; + + iter->current = (LIST_ENTRY *)(DWORD_PTR) iter->ldr_module32.InLoadOrderModuleList.Flink; + return 1; + } + if (!ReadProcessMemory(iter->process, CONTAINING_RECORD(iter->current, LDR_MODULE, InLoadOrderModuleList), &iter->ldr_module, sizeof(iter->ldr_module), NULL)) @@ -1594,7 +1680,10 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, { if (cb >= sizeof(HMODULE)) { - *lphModule++ = iter.ldr_module.BaseAddress; + if (sizeof(void *) == 8 && iter.wow64) + *lphModule++ = (HMODULE) (DWORD_PTR)iter.ldr_module32.BaseAddress; + else + *lphModule++ = iter.ldr_module.BaseAddress; cb -= sizeof(HMODULE); } size += sizeof(HMODULE); diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index 535fb54..980ed0a 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = psapi.dll +IMPORTS = user32 C_SRCS = \ psapi_main.c diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8638d73..3141490 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -33,6 +33,7 @@ #include "winnt.h" #include "winternl.h" #include "winnls.h" +#include "winuser.h" #include "psapi.h" #include "wine/test.h" @@ -62,6 +63,11 @@ static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); + +static BOOL wow64; static BOOL InitFunctionPtrs(HMODULE hpsapi) { @@ -87,6 +93,9 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); pNtQuerySystemInformation = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation"); pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64RevertWow64FsRedirection"); return TRUE; } @@ -110,6 +119,10 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { + char buffer[200] = "C:\\windows\\system32\\notepad.exe"; + PROCESS_INFORMATION pi = {0}; + STARTUPINFOA si = {0}; + void *cookie; HMODULE hMod; DWORD ret, cbNeeded = 0xdeadbeef; @@ -151,6 +164,57 @@ static void test_EnumProcessModules(void) ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + + ret = WaitForInputIdle(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + + SetLastError(0xdeadbeef); + hMod = NULL; + ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); + ok(!!hMod, "expected non-NULL module\n"); + ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); + + TerminateProcess(pi.hProcess, 0); + + if (sizeof(void *) == 8) + { + strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + + ret = WaitForInputIdle(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + + SetLastError(0xdeadbeef); + hMod = NULL; + ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); + ok(!!hMod, "expected non-NULL module\n"); + ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); + + TerminateProcess(pi.hProcess, 0); + } + else if (wow64) + { + pWow64DisableWow64FsRedirection(&cookie); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + pWow64RevertWow64FsRedirection(cookie); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + + ret = WaitForInputIdle(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + + SetLastError(0xdeadbeef); + ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_PARTIAL_COPY, "got error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + } } static void test_GetModuleInformation(void) @@ -781,6 +845,9 @@ START_TEST(psapi_main) { DWORD pid = GetCurrentProcessId(); + if (pIsWow64Process) + IsWow64Process(GetCurrentProcess(), &wow64); + hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid); hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid);

1 0

Zebediah Figura : kernel32: Allow GetModuleBaseName() to succeed on a WoW64 process.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 72e3fdf0a2d81ba97cdeb2067733f14e4fa10a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=72e3fdf0a2d81ba97cdeb206… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 09:33:04 2018 -0500 kernel32: Allow GetModuleBaseName() to succeed on a WoW64 process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 52 ++++++++++++++++++++++++++++++++++++++----- dlls/psapi/tests/psapi_main.c | 6 +++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index ac1f45f..41080aa 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1654,6 +1654,29 @@ static BOOL get_ldr_module(HANDLE process, HMODULE module, LDR_MODULE *ldr_modul return FALSE; } +static BOOL get_ldr_module32(HANDLE process, HMODULE module, LDR_MODULE32 *ldr_module) +{ + MODULE_ITERATOR iter; + INT ret; + + if (!init_module_iterator(&iter, process)) + return FALSE; + + while ((ret = module_iterator_next(&iter)) > 0) + /* When hModule is NULL we return the process image - which will be + * the first module since our iterator uses InLoadOrderModuleList */ + if (!module || (DWORD)(DWORD_PTR) module == iter.ldr_module32.BaseAddress) + { + *ldr_module = iter.ldr_module32; + return TRUE; + } + + if (ret == 0) + SetLastError(ERROR_INVALID_HANDLE); + + return FALSE; +} + /*********************************************************************** * K32EnumProcessModules (KERNEL32.@) * @@ -1720,14 +1743,33 @@ DWORD WINAPI K32GetModuleBaseNameW(HANDLE process, HMODULE module, LPWSTR base_name, DWORD size) { LDR_MODULE ldr_module; + BOOL wow64; - if (!get_ldr_module(process, module, &ldr_module)) + if (!IsWow64Process(process, &wow64)) return 0; - size = min(ldr_module.BaseDllName.Length / sizeof(WCHAR), size); - if (!ReadProcessMemory(process, ldr_module.BaseDllName.Buffer, - base_name, size * sizeof(WCHAR), NULL)) - return 0; + if (sizeof(void *) == 8 && wow64) + { + LDR_MODULE32 ldr_module32; + + if (!get_ldr_module32(process, module, &ldr_module32)) + return 0; + + size = min(ldr_module32.BaseDllName.Length / sizeof(WCHAR), size); + if (!ReadProcessMemory(process, (void *)(DWORD_PTR)ldr_module32.BaseDllName.Buffer, + base_name, size * sizeof(WCHAR), NULL)) + return 0; + } + else + { + if (!get_ldr_module(process, module, &ldr_module)) + return 0; + + size = min(ldr_module.BaseDllName.Length / sizeof(WCHAR), size); + if (!ReadProcessMemory(process, ldr_module.BaseDllName.Buffer, + base_name, size * sizeof(WCHAR), NULL)) + return 0; + } base_name[size] = 0; return size; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 3141490..cc38706 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -182,6 +182,8 @@ static void test_EnumProcessModules(void) if (sizeof(void *) == 8) { + char name[40]; + strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %u\n", GetLastError()); @@ -196,6 +198,10 @@ static void test_EnumProcessModules(void) ok(!!hMod, "expected non-NULL module\n"); ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); + ret = GetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(name, "notepad.exe"), "got %s\n", name); + TerminateProcess(pi.hProcess, 0); } else if (wow64)

1 0