wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Owen Rudge : ws2_32: Extract IPv6 address from brackets in getaddrinfo.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: accf5ef5947591ce6e18f64eebb9dacb9bbfdf3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=accf5ef5947591ce6e18f64ee… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 13 02:07:49 2017 -0300 ws2_32: Extract IPv6 address from brackets in getaddrinfo. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1524192..7a768ac 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6557,7 +6557,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - char *hostname; + char *hostname, *nodeV6 = NULL; const char *node; *res = NULL; @@ -6575,8 +6575,28 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr else if (!nodename[0]) node = hostname; else + { node = nodename; + /* Check for [ipv6] or [ipv6]:portnumber, which are supported by Windows */ + if (!hints || hints->ai_family == WS_AF_UNSPEC || hints->ai_family == WS_AF_INET6) + { + char *close_bracket; + + if (node[0] == '[' && (close_bracket = strchr(node + 1, ']'))) + { + nodeV6 = HeapAlloc(GetProcessHeap(), 0, close_bracket - node); + if (!nodeV6) + { + HeapFree(GetProcessHeap(), 0, hostname); + return WSA_NOT_ENOUGH_MEMORY; + } + lstrcpynA(nodeV6, node + 1, close_bracket - node); + node = nodeV6; + } + } + } + /* servname tweak required by OSX and BSD kernels */ if (servname && !servname[0]) servname = "0"; @@ -6598,6 +6618,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr { SetLastError(WSAESOCKTNOSUPPORT); HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, nodeV6); return SOCKET_ERROR; } @@ -6630,6 +6651,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, nodeV6); if (!result) { struct addrinfo *xuai = unixaires;

1 0

Frédéric Delanoy : French translation for release 2.10
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: 156c17c660d6fe2d34fe107c6f41d885d1725a35 URL: http://source.winehq.org/git/website.git/?a=commit;h=156c17c660d6fe2d34fe10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:25 2017 +0200 French translation for release 2.10 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017060901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2017060901.xml b/news/fr/2017060901.xml new file mode 100644 index 0000000..207a8c6 --- /dev/null +++ b/news/fr/2017060901.xml @@ -0,0 +1,16 @@ +<news> +<date>9 juin 2017</date> +<title>Sortie de Wine 2.10</title> +<body> +La version de développement 2.10 de Wine est disponible. +<a href="{$root}/announce/2.10">Nouveautés</a> de cette version : +<ul> + <li>Version initiale du pilote graphique Android.</li> + <li>Prise en charge des dictionnaires dans WebServices.</li> + <li>Quelques correctifs Direct2D.</li> + <li>Améliorations dans l'interface utilisateur de RegEdit.</li> + <li>Correctifs pour le cache du presse-papiers OLE.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.9
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: 3732957f000231ba519426c1ec66b99f848cb050 URL: http://source.winehq.org/git/website.git/?a=commit;h=3732957f000231ba519426… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:24 2017 +0200 French translation for release 2.9 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017052601.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2017052601.xml b/news/fr/2017052601.xml new file mode 100644 index 0000000..6bf177b --- /dev/null +++ b/news/fr/2017052601.xml @@ -0,0 +1,15 @@ +<news> +<date>26 mai 2017</date> +<title>Sortie de Wine 2.9</title> +<body> +La version de développement 2.9 de Wine est disponible. +<a href="{$root}/announce/2.9">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des shaders de tesselation dans Direct3D.</li> + <li>Prise en charge du mode binaire dans WebServices.</li> + <li>Modifications du presse-papiers détectés via Xfixes.</li> + <li>Améliorations dans l'interface utilisateur de RegEdit.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.9.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.8
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: ed00e7e01a8a3af3a95abb96a471da104897b152 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed00e7e01a8a3af3a95abb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:23 2017 +0200 French translation for release 2.8 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017051201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2017051201.xml b/news/fr/2017051201.xml new file mode 100644 index 0000000..03a174a --- /dev/null +++ b/news/fr/2017051201.xml @@ -0,0 +1,15 @@ +<news> +<date>12 mai 2017</date> +<title>Sortie de Wine 2.8</title> +<body> +La version de développement 2.8 de Wine est disponible. +<a href="{$root}/announce/2.8">Nouveautés</a> de cette version : +<ul> + <li>Le flux de commandes Direct3D tourne de façon asynchrone.</li> + <li>Meilleure autodétection des ports série et parallèle.</li> + <li>Correctifs additionnels pour les réglages points par pouce (PPP) élevés.</li> + <li>Notifications dans la zone de notification système sous macOS.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.8.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.7
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: 51f819ecc37b1e471177384d3750fe2cc3fb9849 URL: http://source.winehq.org/git/website.git/?a=commit;h=51f819ecc37b1e47117738… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:22 2017 +0200 French translation for release 2.7 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017042801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/fr/2017042801.xml b/news/fr/2017042801.xml new file mode 100644 index 0000000..1afce2c --- /dev/null +++ b/news/fr/2017042801.xml @@ -0,0 +1,17 @@ +<news> +<date>28 avril 2017</date> +<title>Sortie de Wine 2.7</title> +<body> +La version de développement 2.7 de Wine est disponible. +<a href="{$root}/announce/2.7">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des connections TCP et UDP dans WebServices.</li> + <li>Diverses améliorations des shaders pour Direct3D 11.</li> + <li>Meilleure prise en charge des réglages points par pouce (PPP) élevés.</li> + <li>Réimplémentation partielle de la bibliothèque GLU.</li> + <li>Prise en charge des versions récentes de OSMesa.</li> + <li>Améliorations dans la gestion des fenêtres sous macOS.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.7.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Francois Gouget : winetest: Let dissect detect and report crashes.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: tools Branch: master Commit: ee648b52fea5d4d94cb46ffcffd73003cd9525d4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ee648b52fea5d4d94cb46ffc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 13 10:36:49 2017 +0200 winetest: Let dissect detect and report crashes. A 'failed crash' line in the summary.txt file now identifies tests that crashed. This way gather does not have to duplicate the dissect code to correctly identify crashed tests (except temporarily for backward compatibility with old summary.txt files). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- winetest/gather | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4901e97..1ecbd94 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -465,7 +465,7 @@ while (<IN>) { } elsif (/$dll:$unit(?::[0-9a-f]+)? done $(-?\d+)$(?:\r?$| in)/) { chomp; # current test ended if ($lines==0 || $1 < 0) { - $result = "failed $1 - -"; + $result = "failed ". ($1 < 0 ? "crash" : $1) ." - -"; my $reason = "test failed: error $1"; if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } diff --git a/winetest/gather b/winetest/gather index 907b205..fbf0397 100755 --- a/winetest/gather +++ b/winetest/gather @@ -324,7 +324,9 @@ foreach my $file (glob "$builddir/*/summary.txt") { $alltests{$testname} = $source; if ($count eq "failed") { - if ($todos eq "filelimit") { + if ($todos eq "crash") { + $report->{$testname} = { status => "crash" }; + } elsif ($todos eq "filelimit") { $report->{$testname} = { status => "file limit" }; $report->{filelimit} = $testname; } else {

1 0

Francois Gouget : testbot/TestLauncher: Tweak the formats to fix MinGW warnings.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: tools Branch: master Commit: b71ad564a5cce053cd26ce193b5a4e272e31fa89 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b71ad564a5cce053cd26ce19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 13 10:23:21 2017 +0200 testbot/TestLauncher: Tweak the formats to fix MinGW warnings. DWORD equates to an unsigned long. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index a790470..ed7fffb 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -114,14 +114,14 @@ static BOOL AllImportedDllsPresent(char *TestExeName) TestExe = CreateFileA(TestExeName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (TestExe == INVALID_HANDLE_VALUE) { - ReportError("Can't open test executable %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't open test executable %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (! ReadFile(TestExe, &DosHeader, sizeof(IMAGE_DOS_HEADER), &NR, NULL) || NR != sizeof(IMAGE_DOS_HEADER)) { CloseHandle(TestExe); - ReportError("Can't read DOS header from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read DOS header from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) @@ -135,20 +135,20 @@ static BOOL AllImportedDllsPresent(char *TestExeName) if (NewPos == INVALID_SET_FILE_POINTER && GetLastError() != ERROR_SUCCESS) { CloseHandle(TestExe); - ReportError("Can't move to NT headers in %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't move to NT headers in %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (! ReadFile(TestExe, &NTHeaders, sizeof(IMAGE_NT_HEADERS), &NR, NULL) || NR != sizeof(IMAGE_NT_HEADERS)) { CloseHandle(TestExe); - ReportError("Can't read NT headers from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read NT headers from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (NTHeaders.Signature != IMAGE_NT_SIGNATURE || NTHeaders.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) { CloseHandle(TestExe); - ReportError("%s does not contain valid NT headers expected 0x%08x/0x%04x found 0x%08x/0x%04x\n", TestExeName, + ReportError("%s does not contain valid NT headers expected 0x%08x/0x%04x found 0x%08lx/0x%04x\n", TestExeName, IMAGE_NT_SIGNATURE, IMAGE_NT_OPTIONAL_HDR_MAGIC, NTHeaders.Signature, NTHeaders.OptionalHeader.Magic); return FALSE; } @@ -156,7 +156,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) if (DataDirectoryImportTable->VirtualAddress == 0 || DataDirectoryImportTable->Size == 0) { CloseHandle(TestExe); - ReportError("%s does not contain valid a valid import table (RVA 0x%x size 0x%x)\n", TestExeName, + ReportError("%s does not contain valid a valid import table (RVA 0x%lx size 0x%lx)\n", TestExeName, DataDirectoryImportTable->VirtualAddress, DataDirectoryImportTable->Size); return FALSE; } @@ -173,7 +173,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) { free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't read section headers from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read section headers from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -201,7 +201,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't move to import directory in %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't move to import directory in %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -210,7 +210,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't read import directory from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read import directory from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -234,7 +234,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't move to import module name in %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't move to import module name in %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -243,7 +243,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't read import directory from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read import directory from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], countof(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - fprintf(stderr, "Can't determine full path of test executable %s, error %u\n", + fprintf(stderr, "Can't determine full path of test executable %s, error %lu\n", argv[Arg], GetLastError()); exit(1); } @@ -396,7 +396,7 @@ int main(int argc, char *argv[]) if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { - fprintf(stderr, "CreateProcess failed with error %u\n", GetLastError()); + fprintf(stderr, "CreateProcess failed with error %lu\n", GetLastError()); exit(1); } @@ -407,20 +407,20 @@ int main(int argc, char *argv[]) switch(WaitStatus) { case WAIT_FAILED: - fprintf(stderr, "Wait for child failed, error %u\n", GetLastError()); + fprintf(stderr, "Wait for child failed, error %lu\n", GetLastError()); break; case WAIT_TIMEOUT: break; default: - fprintf(stderr, "Unexpected return value %u from wait for child\n", WaitStatus); + fprintf(stderr, "Unexpected return value %lu from wait for child\n", WaitStatus); break; } ExitCode = WaitStatus; if (! TerminateProcess(ProcessInformation.hProcess, 257)) - fprintf(stderr, "TerminateProcess failed with error %u\n", GetLastError()); + fprintf(stderr, "TerminateProcess failed with error %lu\n", GetLastError()); switch (WaitForSingleObject(ProcessInformation.hProcess, 5000)) { @@ -428,7 +428,7 @@ int main(int argc, char *argv[]) break; case WAIT_FAILED: - fprintf(stderr, "Wait for terminate failed, error %u\n", GetLastError()); + fprintf(stderr, "Wait for terminate failed, error %lu\n", GetLastError()); break; case WAIT_TIMEOUT: @@ -436,7 +436,7 @@ int main(int argc, char *argv[]) break; default: - fprintf(stderr, "Unexpected return value %u from wait for terminate\n", WaitStatus); + fprintf(stderr, "Unexpected return value %lu from wait for terminate\n", WaitStatus); break; } } @@ -445,12 +445,12 @@ int main(int argc, char *argv[]) if (! GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { ExitCode = 259; - fprintf(stderr, "Can't get child exit code, error %u\n", GetLastError()); + fprintf(stderr, "Can't get child exit code, error %lu\n", GetLastError()); } } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%u)\n", TestName, Subtest, ExitCode); + printf("%s:%s done (%lu)\n", TestName, Subtest, ExitCode); - return 0; + return 0; }

1 0

Francois Gouget : testbot/WineRunTask: Better deal with single test unit executables.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: tools Branch: master Commit: 440f41dad071bf8007311429e68a980cb0d82245 URL: http://source.winehq.org/git/tools.git/?a=commit;h=440f41dad071bf8007311429… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 13 10:14:55 2017 +0200 testbot/WineRunTask: Better deal with single test unit executables. If a Wine test executable has a single test unit, then one can upload and run it without a parameter. In that case TestLauncher does not the test unit name and thus does not print it on the start line. So WineRunTask ends up with $CurrentUnit="" and must account for it when it compares it to the test unit of skip lines. This should also be factored when determining whether the test output follows the Wine test standards. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 7122c57..cd74119 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -477,7 +477,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) sub CheckUnit($$) { my ($Unit, $Type) = @_; - if ($Unit eq $CurrentUnit) + if ($Unit eq $CurrentUnit or $CurrentUnit eq "") { $IsWineTest = 1; } @@ -600,10 +600,14 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) ($CurrentUnit ne "" and $Line =~ /($CurrentUnit)(?:\.c)?:\d+:? Tests? skipped: /)) { + my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they # are misreported (see CloseTestUnit). Also TestLauncher uses the wrong # name in its skip message when skipping tests. - $LineSkips++ if ($1 eq $CurrentUnit or $1 eq $CurrentDll); + if ($Unit eq $CurrentUnit or $CurrentUnit eq "" or $Unit eq $CurrentDll) + { + $LineSkips++; + } } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) {

1 0

Alexandre Julliard : wineandroid: Store the actual screen DPI on startup.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: f254aec4498e9926200ea9fd9cd2acf914747d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f254aec4498e9926200ea9fd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 19:12:30 2017 +0200 wineandroid: Store the actual screen DPI on startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/WineActivity.java | 2 ++ dlls/wineandroid.drv/android.h | 8 ++++++++ dlls/wineandroid.drv/init.c | 18 ++++++++++++++++++ dlls/wineandroid.drv/window.c | 22 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 55eba97..07082dc 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineandroid.drv -IMPORTS = user32 gdi32 ntoskrnl +IMPORTS = user32 gdi32 advapi32 ntoskrnl C_SRCS = \ device.c \ diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 1b99b18..ea1ab85 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -53,6 +53,7 @@ public class WineActivity extends Activity { private native String wine_init( String[] cmdline, String[] env ); public native void wine_desktop_changed( int width, int height ); + public native void wine_config_changed( int dpi ); public native void wine_surface_changed( int hwnd, Surface surface ); public native boolean wine_motion_event( int hwnd, int action, int x, int y, int state, int vscroll ); public native boolean wine_keyboard_event( int hwnd, int action, int keycode, int state ); @@ -508,6 +509,7 @@ public class WineActivity extends Activity top_view = new TopView( this, hwnd ); setContentView( top_view ); progress_dialog.dismiss(); + wine_config_changed( getResources().getConfiguration().densityDpi ); } public void create_window( int hwnd, int parent, int pid ) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 0c3f35f..5ef7668 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -81,10 +81,12 @@ enum android_window_messages extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +extern void set_screen_dpi( DWORD dpi ) DECLSPEC_HIDDEN; extern void update_keyboard_lock_state( WORD vkey, UINT state ) DECLSPEC_HIDDEN; /* JNI entry points */ extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; +extern void config_changed( JNIEnv *env, jobject obj, jint dpi ) DECLSPEC_HIDDEN; extern void surface_changed( JNIEnv *env, jobject obj, jint win, jobject surface ) DECLSPEC_HIDDEN; extern jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, jint y, jint state, jint vscroll ) DECLSPEC_HIDDEN; @@ -94,6 +96,7 @@ extern jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, enum event_type { DESKTOP_CHANGED, + CONFIG_CHANGED, SURFACE_CHANGED, MOTION_EVENT, KEYBOARD_EVENT, @@ -111,6 +114,11 @@ union event_data struct { enum event_type type; + unsigned int dpi; + } cfg; + struct + { + enum event_type type; HWND hwnd; ANativeWindow *window; unsigned int width; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 14aa239..871e41d 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "android.h" #include "wine/server.h" #include "wine/library.h" @@ -82,6 +83,22 @@ void init_monitors( int width, int height ) } +/****************************************************************************** + * set_screen_dpi + */ +void set_screen_dpi( DWORD dpi ) +{ + static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; + static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s',0}; + HKEY hkey; + + if (!RegCreateKeyW( HKEY_CURRENT_CONFIG, dpi_key_name, &hkey )) + { + RegSetValueExW( hkey, dpi_value_name, 0, REG_DWORD, (void *)&dpi, sizeof(DWORD) ); + RegCloseKey( hkey ); + } +} + /********************************************************************** * fetch_display_metrics */ @@ -390,6 +407,7 @@ const struct gdi_dc_funcs * CDECL ANDROID_get_gdi_driver( unsigned int version ) static const JNINativeMethod methods[] = { { "wine_desktop_changed", "(II)V", desktop_changed }, + { "wine_config_changed", "(I)V", config_changed }, { "wine_surface_changed", "(ILandroid/view/Surface;)V", surface_changed }, { "wine_motion_event", "(IIIIII)Z", motion_event }, { "wine_keyboard_event", "(IIII)Z", keyboard_event }, diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 33f2240..3bde739 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -224,6 +224,23 @@ void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) /*********************************************************************** + * config_changed + * + * JNI callback, runs in the context of the Java thread. + */ +void config_changed( JNIEnv *env, jobject obj, jint dpi ) +{ + union event_data data; + + memset( &data, 0, sizeof(data) ); + data.type = CONFIG_CHANGED; + data.cfg.dpi = dpi; + p__android_log_print( ANDROID_LOG_INFO, "wine", "config_changed: %u dpi", dpi ); + send_event( &data ); +} + + +/*********************************************************************** * surface_changed * * JNI callback, runs in the context of the Java thread. @@ -428,6 +445,11 @@ static int process_events( DWORD mask ) SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); break; + case CONFIG_CHANGED: + TRACE( "CONFIG_CHANGED dpi %u\n", event->data.cfg.dpi ); + set_screen_dpi( event->data.cfg.dpi ); + break; + case SURFACE_CHANGED: TRACE("SURFACE_CHANGED %p %p size %ux%u\n", event->data.surface.hwnd, event->data.surface.window, event->data.surface.width, event->data.surface.height );

1 0

Alexandre Julliard : wineandroid: Start in landscape mode and don' t restart on config changes.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 3179a5da9344c34d7b9b8f51b68e69bda3e662d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3179a5da9344c34d7b9b8f51b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 19:12:10 2017 +0200 wineandroid: Start in landscape mode and don't restart on config changes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/AndroidManifest.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/AndroidManifest.xml b/dlls/wineandroid.drv/AndroidManifest.xml index 5eed5ce..631cc1a 100644 --- a/dlls/wineandroid.drv/AndroidManifest.xml +++ b/dlls/wineandroid.drv/AndroidManifest.xml @@ -6,7 +6,10 @@ android:label="Wine" > <activity android:label="Wine" - android:name=".WineActivity" > + android:name=".WineActivity" + android:launchMode="singleInstance" + android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" + android:screenOrientation="sensorLandscape" > <intent-filter > <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" />

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
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