wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 4d8585c761cdb804e605c214e88228a219b78eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8585c761cdb804e605c214e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 14 08:17:46 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 37cd887..846f694 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-06 08:51+0300\n" +"PO-Revision-Date: 2017-06-14 08:17+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12261,7 +12261,7 @@ msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakč #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Išskleidžia arba suskleidžia pasirinktą mazgą" #: regedit.rc:231 msgid "Collapse"

1 0

Paul Gofman : d3dx9: Add const qualifier to regstore_set_values() input data.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 607ae76ada6bbf1602341ef9e9702a8eb4859b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=607ae76ada6bbf1602341ef9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 12 14:22:01 2017 +0300 d3dx9: Add const qualifier to regstore_set_values() input data. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 126f3cc..e9c8387 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -368,7 +368,7 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, get_reg_offset(table, start_offset + count - 1)); } -static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { if (!count)

1 0

Paul Gofman : d3dx9: Introduce get_reg_components() helper function and use it instead of get_offset_reg() when appropriate.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 45b0add67853a715a4166efc629c212f50b24e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b0add67853a715a4166efc6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 12 14:22:00 2017 +0300 d3dx9: Introduce get_reg_components() helper function and use it instead of get_offset_reg() when appropriate. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 522d484..126f3cc 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -296,6 +296,11 @@ static unsigned int get_offset_reg(unsigned int table, unsigned int reg_idx) return table == PRES_REGTAB_OBCONST ? reg_idx : reg_idx << 2; } +static unsigned int get_reg_components(unsigned int table) +{ + return get_offset_reg(table, 1); +} + #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab); @@ -836,10 +841,10 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (FAILED(hr)) return hr; - if (const_count % get_offset_reg(PRES_REGTAB_IMMED, 1)) + if (const_count % get_reg_components(PRES_REGTAB_IMMED)) { FIXME("const_count %u is not a multiple of %u.\n", const_count, - get_offset_reg(PRES_REGTAB_IMMED, 1)); + get_reg_components(PRES_REGTAB_IMMED)); return D3DXERR_INVALIDDATA; } pres->regs.table_sizes[PRES_REGTAB_IMMED] = get_reg_offset(PRES_REGTAB_IMMED, const_count); @@ -1026,7 +1031,7 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->major = param->rows; info->minor = param->columns; } - info->major_stride = max(info->minor, get_offset_reg(table, 1)); + info->major_stride = max(info->minor, get_reg_components(table)); info->major_count = min(info->major * info->major_stride, get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; info->count = info->major_count * info->minor; @@ -1411,7 +1416,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper if (reg_index >= rs->table_sizes[table]) return 0.0; - offset = get_offset_reg(table, reg_index) + offset % get_offset_reg(table, 1); + offset = get_offset_reg(table, reg_index) + offset % get_reg_components(table); } return exec_get_reg_value(rs, table, offset);

1 0

Francois Gouget : winetest/dissect: Better check the task report.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: ab725dad3b8b3076847aeaf06e94a89c8fb125e5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ab725dad3b8b3076847aeaf0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:47:10 2017 +0200 winetest/dissect: Better check the task report. This makes the dissect analysis match the expected results on the report test. In particular it now leverages the pid traces to detect when a test has no test summary line for its main process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 437 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 334 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ab725dad3b8b3076847a…

1 0

Francois Gouget : testbot: Update the TestLauncher binaries when updating Wine.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: 0fd8f624e7a2888d5ba19959405da436053e8ac2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0fd8f624e7a2888d5ba19959… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 09:50:45 2017 +0200 testbot: Update the TestLauncher binaries when updating Wine. And remove the checked-in TestLauncher binaries since we no longer need them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 13 +++++++++++++ testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/windows/TestLauncher32.exe | Bin 432844 -> 0 bytes testbot/bin/windows/TestLauncher64.exe | Bin 115348 -> 0 bytes 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c99c1ab..135a5c3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -376,6 +376,19 @@ elsif (!defined $TAError) if ($NewStatus eq "completed") { use File::Copy; + for my $Bitness ("32", "64") + { + Debug(Elapsed($Start), " Retrieving the $Bitness bit TestLauncher to '$TaskDir/TestLauncher$Bitness.exe'\n"); + if ($TA->GetFile("../src/TestLauncher/TestLauncher$Bitness.exe", "$TaskDir/TestLauncher$Bitness.exe")) + { + copy "$TaskDir/TestLauncher$Bitness.exe", "$DataDir/latest/TestLauncher$Bitness.exe"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving the $Bitness bit TestLauncher: ". $TA->GetLastError(); + } + } + Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index cd74119..22339b7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -362,8 +362,8 @@ my $IsWineTest = 1; if ($Step->Type eq "single") { my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; - Debug(Elapsed($Start), " Sending '$BinDir/windows/$TestLauncher'\n"); - if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) + Debug(Elapsed($Start), " Sending 'latest/$TestLauncher'\n"); + if (!$TA->SendFile("$DataDir/latest/$TestLauncher", $TestLauncher, 0)) { FatalTAError($TA, "Could not copy TestLauncher to the VM"); } diff --git a/testbot/bin/windows/TestLauncher32.exe b/testbot/bin/windows/TestLauncher32.exe deleted file mode 100755 index 3272652..0000000 Binary files a/testbot/bin/windows/TestLauncher32.exe and /dev/null differ diff --git a/testbot/bin/windows/TestLauncher64.exe b/testbot/bin/windows/TestLauncher64.exe deleted file mode 100755 index f18a904..0000000 Binary files a/testbot/bin/windows/TestLauncher64.exe and /dev/null differ

1 0

Francois Gouget : testbot/TestLauncher: The str*_s() functions are not portable. Avoid them.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: 814671cfc719a5980b513bdb61cbe7e012934644 URL: http://source.winehq.org/git/tools.git/?a=commit;h=814671cfc719a5980b513bdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:42:43 2017 +0200 testbot/TestLauncher: The str*_s() functions are not portable. Avoid them. They are missing in older versions of msvcrt, on Windows XP for instance. Also, simply mapping strncpy_s() to strncpy() means the string will not be NUL-terminated! The destination buffers are large enough anyway so use the regular string functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index ed7fffb..53590f8 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -19,13 +19,9 @@ */ #include <stdio.h> +#include <errno.h> #include <windows.h> -#ifdef __MINGW32__ -#define strcpy_s(dest, size, src) strcpy((dest), (src)) -#define strncpy_s(dest, size, src, max) strncpy((dest), (src), (max)) -#define strcat_s(dest, size, src) strcat((dest), (src)) -#endif #define countof(Array) (sizeof(Array) / sizeof(Array[0])) static unsigned Failures = 0; @@ -339,9 +335,12 @@ int main(int argc, char *argv[]) if (Suffix == NULL) Suffix = strchr(TestExeFileName, '.'); if (Suffix == NULL) - strcpy_s(TestName, countof(TestName), TestExeFileName); + strcpy(TestName, TestExeFileName); else - strncpy_s(TestName, _MAX_PATH, TestExeFileName, Suffix - TestExeFileName); + { + strncpy(TestName, TestExeFileName, Suffix - TestExeFileName); + TestName[Suffix - TestExeFileName] = '\0'; + } Subtest = (Arg + 1 < argc ? argv[Arg + 1] : ""); CommandLen = strlen(TestExeFullName) + 3; @@ -356,13 +355,13 @@ int main(int argc, char *argv[]) } CommandLine[0] = '"'; - strcpy_s(CommandLine + 1, CommandLen - 1, TestExeFullName); - strcat_s(CommandLine, CommandLen, "\""); + strcpy(CommandLine + 1, TestExeFullName); + strcat(CommandLine, "\""); for (TestArg = Arg + 1; TestArg < argc; TestArg++) { - strcat_s(CommandLine, CommandLen, " \""); - strcat_s(CommandLine, CommandLen, argv[TestArg]); - strcat_s(CommandLine, CommandLen, "\""); + strcat(CommandLine, " \""); + strcat(CommandLine, argv[TestArg]); + strcat(CommandLine, "\""); } Arg = argc;

1 0

Thomas Faber : devenum/tests: Fix return value check for IEnumMoniker_Next.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: d7eb469d5992f9901b0dd355e5e61709aed31d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eb469d5992f9901b0dd355e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 13 11:50:01 2017 +0200 devenum/tests: Fix return value check for IEnumMoniker_Next. IEnumMoniker::Next returns S_FALSE when there are no (more) items, so checking SUCCEEDED does not make sense. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c2173fe..5a41183 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -154,8 +154,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); @@ -177,8 +177,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); @@ -201,8 +201,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res);

1 0

Zebediah Figura : winemp3.acm: Fix error in acmStreamSize().
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: ffebb919101120feb55cef43bf48e1d142693ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffebb919101120feb55cef43b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:36 2017 -0500 winemp3.acm: Fix error in acmStreamSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index cc6008d..13a6109 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -940,11 +940,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || @@ -952,11 +952,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else

1 0

Zebediah Figura : include: Pack WAVEFORMAT structs.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: d31d656b6f16572025d297b010eba13390deeb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31d656b6f16572025d297b01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:35 2017 -0500 include: Pack WAVEFORMAT structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 13 +++++++++++++ include/mmreg.h | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 13494a6..44a6feb 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1139,6 +1139,18 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); } +static void test_acmFormatTagDetails(void) +{ + ACMFORMATTAGDETAILSW aftd = {0}; + MMRESULT rc; + + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; + rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (rc == MMSYSERR_NOERROR) + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); +} + static struct { struct @@ -1306,6 +1318,7 @@ START_TEST(msacm) driver_tests(); test_prepareheader(); test_acmFormatSuggest(); + test_acmFormatTagDetails(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd(); diff --git a/include/mmreg.h b/include/mmreg.h index 2ee2b00..8bb581d 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -23,6 +23,8 @@ #ifndef __WINE_MMREG_H #define __WINE_MMREG_H +#include <pshpack1.h> + /*********************************************************************** * Defines/Enums */ @@ -512,6 +514,8 @@ typedef struct tagEXBMINFOHEADER { #endif +#include <poppack.h> + #endif /* __WINE_MMREG_H */ #else /* __WIDL__ */

1 0

André Hentschel : winebuild: Emit relay debugging thunks for ARM64.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: eed3bb6dfd52a4e520bd9e2d86ed186b9f3cc688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed3bb6dfd52a4e520bd9e2d8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 12 20:30:43 2017 +0200 winebuild: Emit relay debugging thunks for ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f3feb0f..39733b2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -84,7 +84,9 @@ static int has_relays( DLLSPEC *spec ) { int i; - if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && target_cpu != CPU_ARM) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && + target_cpu != CPU_ARM && target_cpu != CPU_ARM64) + return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -242,6 +244,41 @@ static void output_relay_debug( DLLSPEC *spec ) break; } + case CPU_ARM64: + switch (args) + { + default: + case 8: + case 7: output( "\tstp x6, x7, [SP,#-16]!\n" ); + /* fall through */ + case 6: + case 5: output( "\tstp x4, x5, [SP,#-16]!\n" ); + /* fall through */ + case 4: + case 3: output( "\tstp x2, x3, [SP,#-16]!\n" ); + /* fall through */ + case 2: + case 1: output( "\tstp x0, x1, [SP,#-16]!\n" ); + /* fall through */ + case 0: break; + } + output( "\tstp x29, x30, [SP,#-16]!\n" ); + output( "\tstp x8, x9, [SP,#-16]!\n" ); + output( "\tmov x2, SP\n"); + if (odp->flags & FLAG_RET64) flags |= 1; + output( "\tmov w1, #%u\n", (flags << 24) ); + if (args) output( "\tadd w1, w1, #%u\n", (args << 16) ); + if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); + output( "\tldr x0, 1f\n"); + output( "\tldr x3, [x0, #8]\n"); + output( "\tblr x3\n"); + output( "\tadd SP, SP, #16\n" ); + output( "\tldp x29, x30, [SP], #16\n" ); + if (args) output( "\tadd SP, SP, #%u\n", 8 * ((min(args, 8) + 1) & 0xe) ); + output( "\tret\n"); + output( "\t1: .quad .L__wine_spec_relay_descr\n"); + break; + case CPU_x86_64: output( "\tsubq $40,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 40" );

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
60
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 June 2017