wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

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/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: Adjust the StepsTasks fields.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: 7289b67f0fd4c5a6b00aa5e59475610519080b4c URL: https://source.winehq.org/git/tools.git/?a=commit;h=7289b67f0fd4c5a6b00aa5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 10:59:40 2018 +0200 testbot: Adjust the StepsTasks fields. The StepTask class duplicates the Step and Task classes and its fields are mostly used in read-only mode so we don't care about their exact type too much, particularly for enums. Still, try to specify valid lengths so we don't get errors one day if Validate() is called. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/StepsTasks.pm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index ff94b14..db0cc06 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -162,20 +162,21 @@ sub CreateItem($) return WineTestBot::StepTask->new($self); } +# Note: To simplify maintenance replace enums with simple string fields. my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), - CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("TaskNo", "Task no", ! 1, 1, "N", 2), - CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 6), - CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 9), - CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), + CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), + CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("TaskNo", "Task no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), + CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), + CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), - CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), ); sub CreateStepsTasks(;$$)

1 0

Francois Gouget : testbot: Fix handling of test unit additions/ removals in patch series.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: 6521df329b7b38d55f3d84ad7783097ee97ef382 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6521df329b7b38d55f3d84a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 10:06:10 2018 +0200 testbot: Fix handling of test unit additions/removals in patch series. The TestBot used to only analyse the last patch in the series to determine whether it impacts the tests or not. However patches to resource files and helper dlls require having an up-to-date list of the test units, and that list may be impacted by previous patches in the series. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 19 +++++++++++++++++-- testbot/lib/WineTestBot/Patches.pm | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index a466df3..611d883 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -127,9 +127,9 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$) +sub GetPatchImpact($;$$) { - my ($PatchFileName, $NoUnits) = @_; + my ($PatchFileName, $NoUnits, $PastImpacts) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); @@ -138,6 +138,21 @@ sub GetPatchImpact($;$) NoUnits => $NoUnits, Tests => {}, }; + + if ($PastImpacts) + { + foreach my $PastInfo (values %{$PastImpacts->{Tests}}) + { + if ($PastInfo->{Files}) + { + foreach my $File (keys %{$PastInfo->{Files}}) + { + _AddTest($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); + } + } + } + } my ($Path, $Change); while (my $Line = <$fh>) { diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d4a5e0b..71d735b 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -132,7 +132,9 @@ sub Submit($$$) { my ($self, $PatchFileName, $IsSet) = @_; - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id); + my $PastImpacts; + $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { $self->Disposition(($IsSet ? "Set" : "Patch") .

1 0

Francois Gouget : testbot/build: Tell Wine not to rebuild the WineTest executable.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: acae980d674fe761b3eec6271ce888905eb28cf3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=acae980d674fe761b3eec62… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 10:04:55 2018 +0200 testbot/build: Tell Wine not to rebuild the WineTest executable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 322638e..6f46114 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -148,7 +148,7 @@ sub BuildNative() # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " time ../wine/configure --enable-win64 --without-x --without-freetype && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -171,8 +171,8 @@ sub BuildCross($) # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " time make -j$ncpus programs/winetest " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . + " time make -j$ncpus buildtests" . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) {

1 0

Jacek Caban : mshtml: Use proper document mode for document fragment objects.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: d3a71dec7ee99e9c65630d080c02d7d4182e61a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3a71dec7ee99e9c65630d08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 19:49:51 2018 +0200 mshtml: Use proper document mode for document fragment objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/tests/documentmode.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8cee880..6030681 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5197,6 +5197,7 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode, &HTMLDocumentNode_dispex); doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; + doc_frag->document_mode = lock_document_mode(doc_node); *ret = doc_frag; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 663cce7..aa5954b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -70,6 +70,23 @@ function test_doc_props() { next_test(); } +function test_docfrag_props() { + var docfrag = document.createDocumentFragment(); + + function test_exposed(prop, expect) { + if(expect) + ok(prop in docfrag, prop + " not found in document fragent."); + else + ok(!(prop in docfrag), prop + " found in document fragent."); + } + + var v = document.documentMode; + + test_exposed("compareDocumentPosition", v >= 9); + + next_test(); +} + function test_window_props() { function test_exposed(prop, expect) { if(expect) @@ -247,6 +264,7 @@ var tests = [ test_iframe_doc_mode, test_elem_props, test_doc_props, + test_docfrag_props, test_window_props, test_javascript, test_xhr_props,

1 0

Jacek Caban : mshtml: Use case insensitive comparition in parse_ua_compatible.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: c36bbc352e53a4779f1eab79491f0d8ab4032b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36bbc352e53a4779f1eab79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 19:49:41 2018 +0200 mshtml: Use case insensitive comparition in parse_ua_compatible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 3 ++- dlls/mshtml/tests/script.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 1144b47..39a0e58 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -393,11 +393,12 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) { int v = 0; + static const WCHAR ie_eqW[] = {'I','E','='}; static const WCHAR edgeW[] = {'e','d','g','e',0}; TRACE("%s\n", debugstr_w(p)); - if(p[0] != 'I' || p[1] != 'E' || p[2] != '=') + if(strncmpiW(ie_eqW, p, sizeof(ie_eqW)/sizeof(WCHAR))) return FALSE; p += 3; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index db6ac25..3decb86 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3425,7 +3425,7 @@ static void run_script_as_http_with_mode(const char *script, const char *opt, co " </body>\n" "</html>\n", document_mode ? "<!DOCTYPE html>\n" : "", - document_mode ? "<meta http-equiv=\"x-ua-compatible\" content=\"IE=" : "", + document_mode ? "<meta http-equiv=\"x-ua-compatible\" content=\"Ie=" : "", document_mode ? document_mode : "", document_mode ? "\">" : "", script);

1 0

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

30 May '18

Module: wine Branch: master Commit: 0250693354958ce0a12fed059f968b830bca8fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0250693354958ce0a12fed05… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 09:33:06 2018 -0500 kernel32: Allow GetModuleInformation() 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 | 26 ++++++++++++++++++++++---- dlls/psapi/tests/psapi_main.c | 7 +++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 01d28a8..3ab70e8 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1907,6 +1907,7 @@ BOOL WINAPI K32GetModuleInformation(HANDLE process, HMODULE module, MODULEINFO *modinfo, DWORD cb) { LDR_MODULE ldr_module; + BOOL wow64; if (cb < sizeof(MODULEINFO)) { @@ -1914,12 +1915,29 @@ BOOL WINAPI K32GetModuleInformation(HANDLE process, HMODULE module, return FALSE; } - if (!get_ldr_module(process, module, &ldr_module)) + if (!IsWow64Process(process, &wow64)) return FALSE; - modinfo->lpBaseOfDll = ldr_module.BaseAddress; - modinfo->SizeOfImage = ldr_module.SizeOfImage; - modinfo->EntryPoint = ldr_module.EntryPoint; + if (sizeof(void *) == 8 && wow64) + { + LDR_MODULE32 ldr_module32; + + if (!get_ldr_module32(process, module, &ldr_module32)) + return FALSE; + + modinfo->lpBaseOfDll = (void *)(DWORD_PTR)ldr_module32.BaseAddress; + modinfo->SizeOfImage = ldr_module32.SizeOfImage; + modinfo->EntryPoint = (void *)(DWORD_PTR)ldr_module32.EntryPoint; + } + else + { + if (!get_ldr_module(process, module, &ldr_module)) + return FALSE; + + modinfo->lpBaseOfDll = ldr_module.BaseAddress; + modinfo->SizeOfImage = ldr_module.SizeOfImage; + modinfo->EntryPoint = ldr_module.EntryPoint; + } return TRUE; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index fccf82d..4adc826 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -182,6 +182,7 @@ static void test_EnumProcessModules(void) if (sizeof(void *) == 8) { + MODULEINFO info; char name[40]; strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); @@ -207,6 +208,12 @@ static void test_EnumProcessModules(void) todo_wine ok(!strcmp(name, buffer), "got %s\n", name); + ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); + ok(ret, "got error %u\n", GetLastError()); + ok(info.lpBaseOfDll == hMod, "expected %p, got %p\n", hMod, info.lpBaseOfDll); + ok(info.SizeOfImage, "image size was 0\n"); + ok(info.EntryPoint >= info.lpBaseOfDll, "got entry point %p\n", info.EntryPoint); + TerminateProcess(pi.hProcess, 0); } else if (wow64)

1 0

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

30 May '18

Module: wine Branch: master Commit: 54f287d88a13d99f3aa49528024378478988afa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f287d88a13d99f3aa49528… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 09:33:05 2018 -0500 kernel32: Allow GetModuleFileNameEx() 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 | 29 ++++++++++++++++++++++++----- dlls/psapi/tests/psapi_main.c | 5 +++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 41080aa..01d28a8 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1812,17 +1812,36 @@ DWORD WINAPI K32GetModuleFileNameExW(HANDLE process, HMODULE module, LPWSTR file_name, DWORD size) { LDR_MODULE ldr_module; + BOOL wow64; DWORD len; if (!size) return 0; - if(!get_ldr_module(process, module, &ldr_module)) + if (!IsWow64Process(process, &wow64)) return 0; - len = ldr_module.FullDllName.Length / sizeof(WCHAR); - if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, - file_name, min( len, 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; + + len = ldr_module32.FullDllName.Length / sizeof(WCHAR); + if (!ReadProcessMemory(process, (void *)(DWORD_PTR)ldr_module32.FullDllName.Buffer, + file_name, min( len, size ) * sizeof(WCHAR), NULL)) + return 0; + } + else + { + if (!get_ldr_module(process, module, &ldr_module)) + return 0; + + len = ldr_module.FullDllName.Length / sizeof(WCHAR); + if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, + file_name, min( len, size ) * sizeof(WCHAR), NULL)) + return 0; + } if (len < size) { diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index cc38706..fccf82d 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -202,6 +202,11 @@ static void test_EnumProcessModules(void) ok(ret, "got error %u\n", GetLastError()); ok(!strcmp(name, "notepad.exe"), "got %s\n", name); + ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); + ok(ret, "got error %u\n", GetLastError()); +todo_wine + ok(!strcmp(name, buffer), "got %s\n", name); + TerminateProcess(pi.hProcess, 0); } else if (wow64)

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

← Newer
1
2
3
4
5
6
7
8
...
72
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 2018