December 2017 - Wine-commits

Francois Gouget : testbot/Engine: Fix handling of --kill-vms.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: b679f7fb2daf0d9e011c0dee2ce8ed33fd5e5031 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b679f7fb2daf0d9e011c0dee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:58:45 2017 +0100 testbot/Engine: Fix handling of --kill-vms. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index dfe266f..7dab98e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -207,6 +207,12 @@ sub Cleanup($;$$) $VM->RunPowerOff(); } } + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + elsif ($KillVMs and $VM->Status !~ /^(?:off|offline)$/) + { + $VM->RunPowerOff(); + } } }

1 0

Francois Gouget : testbot/web: Remove an unnecessary WineTestBot:: Config prefix.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: b0277542085dc35746b313817a14818629c66a31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b0277542085dc35746b31381… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 08:00:40 2017 +0100 testbot/web: Remove an unnecessary WineTestBot::Config prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b0c2d45..deacf90 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -277,7 +277,7 @@ sub GenerateBody($) my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - if ($WineTestBot::Config::JobArchiveDays != 0) + if ($JobArchiveDays != 0) { my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName('Id'); my $MaxIdLength = $PropertyDescriptor->GetMaxLength();

1 0

Alexandre Julliard : wine_release: Remove the winapi_stats page generation , it's not meaningful information.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: 7498191d2b7b9f3e01856601d57bea131da37c9d URL: http://source.winehq.org/git/tools.git/?a=commit;h=7498191d2b7b9f3e01856601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 12:45:17 2017 +0100 wine_release: Remove the winapi_stats page generation, it's not meaningful information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winapi_stats | 62 ------------------------------------------------------------ wine_release | 9 +-------- 2 files changed, 1 insertion(+), 70 deletions(-) diff --git a/winapi_stats b/winapi_stats deleted file mode 100755 index 786017f..0000000 --- a/winapi_stats +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/perl -# -# Filter to generate the winapi stats table using winapi_extract. -# Must be run from the Wine top-level source directory. -# - -my %stats; - -open STATS, "-|" or exec "./tools/winapi/winapi_extract", "--pseudo-stub-statistics", "--no-verbose", "--no-progress" or die "cannot run winapi_extract"; -while (<STATS>) -{ - chomp; - if (/\*\.c: (.*): (\d+) of (\d+) functions are stubs $(\d+) real, (\d+) pseudo$ and (\d+) are forwards/) - { - my ($dll, $stubs, $total, $real, $pseudo, $forwards) = ($1, $2, $3, $4, $5, $6); - next if $dll =~ /^(wine.*\.drv|wine.*\.acm|wined3d|winedos|wprocs)$/; - $stats{$dll} = [ $stubs, $total, $real, $pseudo, $forwards ]; - ${$stats{" Total"}}[0] += $stubs; - ${$stats{" Total"}}[1] += $total; - ${$stats{" Total"}}[2] += $real; - ${$stats{" Total"}}[3] += $pseudo; - ${$stats{" Total"}}[4] += $forwards; - } -} -close STATS or die "winapi_extract failed"; - -my $bg = 0; - -print "\n\n"; -print "<h3>Win API Stats</h3>\n\n"; -print "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"3\">\n\n"; -print "<tr class=\"hdr\">\n"; -print "<th>Library</th>\n"; -print "<th>API count</th>\n"; -print "<th>% implemented</th>\n"; -print "<th>Total stubs</th>\n"; -print "<th>Real stubs</th>\n"; -print "<th>Pseudo stubs</th>\n"; -print "<th>Forwards</th>\n"; -print "</tr>\n"; - -foreach my $dll (sort keys %stats) -{ - my ($stubs, $total, $real, $pseudo, $forwards) = @{$stats{$dll}}; - my $color = $bg ? "white" : "grey"; - my $pct = $total ? ($total - $stubs) / $total * 100 : 0; - printf "<tr>\n"; - printf "<td class=\"%s\">%s</td>\n", $color, $dll; - printf "<td class=\"%s\">%u</td>\n", $color, $total; - printf "<td class=\"pct%u\">%u%%</td>\n", int(($pct + 2.5) / 5) * 5, $pct; - printf "<td class=\"%s\">%u</td>\n", $color, $stubs; - printf "<td class=\"%s\">%u</td>\n", $color, $real; - printf "<td class=\"%s\">%u</td>\n", $color, $pseudo; - printf "<td class=\"%s\">%u</td>\n", $color, $forwards; - printf "</tr>\n"; - $bg = !$bg; -} - -my $now = `date`; -chomp $now; -print "\n</table>\n"; -print "<p>last modified: $now</p>\n"; diff --git a/wine_release b/wine_release index aed1545..7b8def1 100755 --- a/wine_release +++ b/wine_release @@ -32,14 +32,11 @@ if [ "$branch" = "master" ] then # nuke old attempt (if any) rm -rf wine-$version - git clone -l -s -n git/wine.git wine-$version + git clone -b wine-$version git/wine.git wine-$version cd wine-$version - git checkout wine-$version # update man page and documentation - echo "==== UPDATING DOCUMENTATION ====" ./configure --quiet --without-x --without-freetype - make -s depend manpages="\ loader/wine.man \ @@ -74,10 +71,6 @@ then make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI - # Wine API Stats - echo "==== UPDATING WINE API STATS PAGE ====" - $tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template - cd .. rm -rf wine-$version fi

1 0

Alexandre Julliard : git-to-cvs: Remove obsolete script.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: c45dbf6b8b974ff50991000df7d8095080c5cb36 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c45dbf6b8b974ff50991000d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 13:09:43 2017 +0100 git-to-cvs: Remove obsolete script. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- git-to-cvs | 406 ------------------------------------------------------------- 1 file changed, 406 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c45dbf6b8b974ff50991…

1 0

Huw Davies : ole32: Correctly save the remaining formats if their data has not been set.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 33be9fc78f51f869bd2bb8ab5e7ac205eeb5af47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33be9fc78f51f869bd2bb8ab5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 14 13:17:38 2017 +0000 ole32: Correctly save the remaining formats if their data has not been set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 48 +++++++++++++++++++++--------------------------- dlls/ole32/tests/ole2.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ae05b8e..ad55c6e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -829,17 +829,16 @@ static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) if (hr == S_OK && data_size) hr = IStream_Write(stream, bmi, data_size, NULL); } - else + else if(data_size) { BITMAPFILEHEADER bmp_fhdr; bmp_fhdr.bfType = 0x4d42; bmp_fhdr.bfSize = data_size + sizeof(BITMAPFILEHEADER); bmp_fhdr.bfReserved1 = bmp_fhdr.bfReserved2 = 0; - if (data_size) - bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); + bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); hr = IStream_Write(stream, &bmp_fhdr, sizeof(BITMAPFILEHEADER), NULL); - if (hr == S_OK && data_size) + if (hr == S_OK) hr = IStream_Write(stream, bmi, data_size, NULL); } @@ -897,25 +896,22 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { struct meta_placeable meta_place_rec; WORD *check; - if (entry->stgmedium.tymed != TYMED_NULL) + mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); + if (!mfpict) + return DV_E_STGMEDIUM; + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!data) { - mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - return DV_E_STGMEDIUM; - data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); - data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!data) - { - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - return E_OUTOFMEMORY; - } - GetMetaFileBitsEx(mfpict->hMF, data_size, data); + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + return E_OUTOFMEMORY; } + GetMetaFileBitsEx(mfpict->hMF, data_size, data); /* units are in 1/8th of a point (1 point is 1/72th of an inch) */ meta_place_rec.key = 0x9ac6cdd7; @@ -927,13 +923,12 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = 0; meta_place_rec.checksum = 0; meta_place_rec.reserved = 0; - if (mfpict) - { - /* These values are rounded down so MulDiv won't do the right thing */ - meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; - meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - } + + /* These values are rounded down so MulDiv won't do the right thing */ + meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; + meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); @@ -982,7 +977,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { data_size = GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, 0, NULL); data = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) + sizeof(ENHMETAHEADER) + data_size); @@ -991,8 +986,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, data_size, data + sizeof(DWORD) + sizeof(ENHMETAHEADER)); memcpy(data + sizeof(DWORD), data + sizeof(DWORD) + sizeof(ENHMETAHEADER), sizeof(ENHMETAHEADER)); data_size += sizeof(DWORD) + sizeof(ENHMETAHEADER); - if (hr == S_OK && data_size) - hr = IStream_Write(stream, data, data_size, NULL); + hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f42ebe2..fe45c6a 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4226,35 +4226,64 @@ static void test_data_cache_save_data(void) { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 3, 3, &CLSID_WineTest, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } } }, + /* without setting data */ { { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + }, + 3, 0, &CLSID_WineTest, + { + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + /* static picture clsids */ + { + { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_Dib, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } + } + }, + { + { + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + }, + 1, 1, &CLSID_Picture_Metafile, + { + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, { { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_EnhMetafile, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, + /* static picture clsids without setting any data */ { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_Picture_Dib, + 1, 0, &CLSID_Picture_Dib, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4263,7 +4292,7 @@ static void test_data_cache_save_data(void) { { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, }, - 1, 1, &CLSID_Picture_Metafile, + 1, 0, &CLSID_Picture_Metafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4272,7 +4301,7 @@ static void test_data_cache_save_data(void) { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_Picture_EnhMetafile, + 1, 0, &CLSID_Picture_EnhMetafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } }

1 0

Joel Holdsworth : urlmon: Support [Add.Code] sections in ActiveX INF files.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 185bcc4523c5827a78a56c63735f1a5f502e999b URL: http://source.winehq.org/git/wine.git/?a=commit;h=185bcc4523c5827a78a56c637… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Dec 13 13:32:22 2017 -0700 urlmon: Support [Add.Code] sections in ActiveX INF files. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 7ee7d94..d2cf7e6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -251,12 +251,25 @@ static HRESULT install_inf_file(install_ctx_t *ctx) len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); if(len) { - FIXME("[Add.Code] section not supported\n"); + default_install = FALSE; - /* Don't throw an error if we successfully ran setup hooks; - installation is likely to be complete enough */ - if(default_install) - return E_NOTIMPL; + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Add.Code] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, sect_name, + ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } } if(default_install) {

1 0

Alexandre Julliard : ntdll: Set all registers in set_cpu_context() on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 8a07ee48fa96e12474cb6f7c1d365858aaebcdff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a07ee48fa96e12474cb6f7c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 18:34:19 2017 +0100 ntdll: Set all registers in set_cpu_context() on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 51 ++++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index dcb4564..fc65c87 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -262,24 +262,10 @@ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" /* FIXME: Use the Stack instead of the actual register values */ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, ".arm\n\t" - "stmfd SP!, {r1}\n\t" - "mov r1, #0x0200000\n\t"/* CONTEXT_ARM */ - "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ - "str r1, [r0]\n\t" /* context->ContextFlags */ - "ldmfd SP!, {r1}\n\t" - "str r0, [r0, #0x4]\n\t" /* context->R0 */ - "str r1, [r0, #0x8]\n\t" /* context->R1 */ - "str r2, [r0, #0xc]\n\t" /* context->R2 */ - "str r3, [r0, #0x10]\n\t" /* context->R3 */ - "str r4, [r0, #0x14]\n\t" /* context->R4 */ - "str r5, [r0, #0x18]\n\t" /* context->R5 */ - "str r6, [r0, #0x1c]\n\t" /* context->R6 */ - "str r7, [r0, #0x20]\n\t" /* context->R7 */ - "str r8, [r0, #0x24]\n\t" /* context->R8 */ - "str r9, [r0, #0x28]\n\t" /* context->R9 */ - "str r10, [r0, #0x2c]\n\t" /* context->R10 */ - "str r11, [r0, #0x30]\n\t" /* context->R11 */ - "str IP, [r0, #0x34]\n\t" /* context->R12 */ + "stmib r0, {r0-r12}\n\t" /* context->R0..R12 */ + "mov r1, #0x0200000\n\t" /* CONTEXT_ARM */ + "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ + "str r1, [r0]\n\t" /* context->ContextFlags */ "str SP, [r0, #0x38]\n\t" /* context->Sp */ "str LR, [r0, #0x3c]\n\t" /* context->Lr */ "str PC, [r0, #0x40]\n\t" /* context->Pc */ @@ -294,26 +280,17 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, * * Set the new CPU context. */ -/* FIXME: What about the CPSR? */ -void set_cpu_context( const CONTEXT *context ); +void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_cpu_context, - "mov IP, r0\n\t" - "ldr r0, [IP, #0x4]\n\t" /* context->R0 */ - "ldr r1, [IP, #0x8]\n\t" /* context->R1 */ - "ldr r2, [IP, #0xc]\n\t" /* context->R2 */ - "ldr r3, [IP, #0x10]\n\t" /* context->R3 */ - "ldr r4, [IP, #0x14]\n\t" /* context->R4 */ - "ldr r5, [IP, #0x18]\n\t" /* context->R5 */ - "ldr r6, [IP, #0x1c]\n\t" /* context->R6 */ - "ldr r7, [IP, #0x20]\n\t" /* context->R7 */ - "ldr r8, [IP, #0x24]\n\t" /* context->R8 */ - "ldr r9, [IP, #0x28]\n\t" /* context->R9 */ - "ldr r10, [IP, #0x2c]\n\t" /* context->R10 */ - "ldr r11, [IP, #0x30]\n\t" /* context->R11 */ - "ldr SP, [IP, #0x38]\n\t" /* context->R12 */ - "ldr LR, [IP, #0x3c]\n\t" /* context->Lr */ - "ldr PC, [IP, #0x40]\n\t" /* context->Pc */ - ) + ".arm\n\t" + "ldr r1, [r0, #0x44]\n\t" /* context->Cpsr */ + "msr CPSR_f, r1\n\t" + "ldr r1, [r0, #0x40]\n\t" /* context->Pc */ + "ldr lr, [r0, #0x3c]\n\t" /* context->Lr */ + "ldr sp, [r0, #0x38]\n\t" /* context->Sp */ + "push {r1}\n\t" + "ldmib r0, {r0-r12}\n\t" /* context->R0..R12 */ + "pop {pc}" ) /***********************************************************************

1 0

Alexandre Julliard : ntdll: Reimplement thread initialization in assembler on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: f492efdb3c77f015247f6b73d98110a0353035b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f492efdb3c77f015247f6b73d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 18:34:46 2017 +0100 ntdll: Reimplement thread initialization in assembler on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 60 ++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index fc65c87..23f494d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1220,35 +1220,31 @@ static void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) abort(); /* should not be reached */ } -typedef void (WINAPI *thread_start_func)(LPTHREAD_START_ROUTINE,void *); - -struct startup_info -{ - thread_start_func start; - LPTHREAD_START_ROUTINE entry; - void *arg; - BOOL suspend; -}; - -/*********************************************************************** - * thread_startup - */ -static void thread_startup( void *param ) -{ - CONTEXT context = { 0 }; - struct startup_info *info = param; - - /* build the initial context */ - context.ContextFlags = CONTEXT_FULL; - context.R0 = (DWORD)info->entry; - context.R1 = (DWORD)info->arg; - context.Sp = (DWORD)NtCurrentTeb()->Tib.StackBase; - context.Pc = (DWORD)info->start; - - attach_dlls( &context, info->suspend ); - - set_cpu_context( &context ); -} +extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, + void *relay, TEB *teb ); +__ASM_GLOBAL_FUNC( start_thread, + ".arm\n\t" + "push {r4-r12,lr}\n\t" + /* build initial context on thread stack */ + "ldr r4, [sp, #40]\n\t" /* teb */ + "ldr r4, [r4, #4]\n\t" /* teb->Tib.StackBase */ + "sub r5, r4, #0x1a0\n\t" /* sizeof(CONTEXT) */ + "mov ip, #0x0200000\n\t" /* CONTEXT_ARM */ + "add ip, #0x3\n\t" /* CONTEXT_FULL */ + "str ip, [r5]\n\t" /* context->ContextFlags */ + "str r0, [r5, #0x4]\n\t" /* context->R0 = entry */ + "str r1, [r5, #0x8]\n\t" /* context->R1 = arg */ + "str r4, [r5, #0x38]\n\t" /* context->Sp = stack */ + "str r3, [r5, #0x40]\n\t" /* context->Pc = relay */ + /* switch to thread stack */ + "mov sp, r5\n\t" + /* attach dlls */ + "mov r0, r5\n\t" /* context */ + "mov r1, r2\n\t" /* suspend */ + "bl " __ASM_NAME("attach_dlls") "\n\t" + /* switch to the initial context */ + "mov r0, r5\n\t" + "b " __ASM_NAME("set_cpu_context") ) /*********************************************************************** * signal_start_thread @@ -1260,8 +1256,7 @@ static void thread_startup( void *param ) */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - struct startup_info info = { call_thread_entry_point, entry, arg, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, arg, suspend, call_thread_entry_point, NtCurrentTeb() ); } /********************************************************************** @@ -1274,8 +1269,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - struct startup_info info = { kernel32_start_process, entry, NtCurrentTeb()->Peb, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process, NtCurrentTeb() ); } /***********************************************************************

1 0

Alexandre Julliard : ntdll: Switch back to the initial stack for thread exit on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: d147c4c3239a367381ac5dbccbc1cab40699fedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d147c4c3239a367381ac5dbcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 20:28:16 2017 +0100 ntdll: Switch back to the initial stack for thread exit on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 23f494d..272fc7b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1225,8 +1225,10 @@ extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void * __ASM_GLOBAL_FUNC( start_thread, ".arm\n\t" "push {r4-r12,lr}\n\t" - /* build initial context on thread stack */ + /* store exit frame */ "ldr r4, [sp, #40]\n\t" /* teb */ + "str sp, [r4, #0x1d4]\n\t" /* teb->SystemReserved2 */ + /* build initial context on thread stack */ "ldr r4, [r4, #4]\n\t" /* teb->Tib.StackBase */ "sub r5, r4, #0x1a0\n\t" /* sizeof(CONTEXT) */ "mov ip, #0x0200000\n\t" /* CONTEXT_ARM */ @@ -1246,6 +1248,16 @@ __ASM_GLOBAL_FUNC( start_thread, "mov r0, r5\n\t" "b " __ASM_NAME("set_cpu_context") ) +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + ".arm\n\t" + "ldr r3, [r2, #0x1d4]\n\t" /* teb->SystemReserved2 */ + "mov ip, #0\n\t" + "str ip, [r2, #0x1d4]\n\t" + "cmp r3, ip\n\t" + "movne sp, r3\n\t" + "blx r1" ) + /*********************************************************************** * signal_start_thread * @@ -1277,7 +1289,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - exit_thread( status ); + call_thread_exit_func( status, exit_thread, NtCurrentTeb() ); } /*********************************************************************** @@ -1285,7 +1297,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - exit( status ); + call_thread_exit_func( status, exit, NtCurrentTeb() ); } /**********************************************************************

1 0

Alexandre Julliard : ntdll: Define PTHREAD_STACK_MIN if it's missing.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 6eab1e93f34075477df323ad6f5f0f97815fbc50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eab1e93f34075477df323ad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 20:28:32 2017 +0100 ntdll: Define PTHREAD_STACK_MIN if it's missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6abfd85..479b8d6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -48,6 +48,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); +#ifndef PTHREAD_STACK_MIN +#define PTHREAD_STACK_MIN 16384 +#endif + struct _KUSER_SHARED_DATA *user_shared_data = NULL; PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL;

1 0