June 2021 - Wine-commits - list.winehq.org

Francois Gouget : gdi32/tests: Add a context to the testJustification() failure message.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: a82ab29308376991ed492da947f6afdb18dde23f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a82ab29308376991ed492da9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 10 14:11:58 2021 +0200 gdi32/tests: Add a context to the testJustification() failure message. It is called in three places so this allows identifying which one failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ffb400ba838..4d7887e753f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2376,7 +2376,7 @@ static void test_GetOutlineTextMetrics(void) ReleaseDC(0, hdc); } -static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) +static void testJustification(const char *context, HDC hdc, PCSTR str, RECT *clientArea) { INT y, breakCount, @@ -2447,8 +2447,8 @@ static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ ok(error[e].GetTextExtentExPointWWidth == areaWidth, - "GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", - error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); + "%s: GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", + context, error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); } } @@ -2491,7 +2491,7 @@ static void test_SetTextJustification(void) hfont = create_font("Times New Roman", &lf); SelectObject(hdc, hfont); - testJustification(hdc, testText, &clientArea); + testJustification("default", hdc, testText, &clientArea); if (!pGetTextExtentExPointI) goto done; GetGlyphIndicesA( hdc, "A ", 2, indices, 0 ); @@ -2528,7 +2528,7 @@ static void test_SetTextJustification(void) SetWindowExtEx( hdc, 2, 2, NULL ); GetClientRect( hwnd, &clientArea ); DPtoLP( hdc, (POINT *)&clientArea, 2 ); - testJustification(hdc, testText, &clientArea); + testJustification("2x2", hdc, testText, &clientArea); GetTextExtentPoint32A(hdc, "A", 1, &expect); for (i = 0; i < 10; i++) @@ -2550,7 +2550,7 @@ static void test_SetTextJustification(void) SetViewportExtEx( hdc, 3, 3, NULL ); GetClientRect( hwnd, &clientArea ); DPtoLP( hdc, (POINT *)&clientArea, 2 ); - testJustification(hdc, testText, &clientArea); + testJustification("3x3", hdc, testText, &clientArea); GetTextExtentPoint32A(hdc, "A", 1, &expect); for (i = 0; i < 10; i++)

1 0

Alexandre Julliard : ntdll: Fix some exception test failures on ARM.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 4e740387499e4322e397b6473e77fbf78f852430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e740387499e4322e397b647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 11:10:22 2021 +0200 ntdll: Fix some exception test failures on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 26 ++++++-------- dlls/ntdll/tests/exception.c | 84 +++++++++++++++++++++----------------------- dlls/ntdll/unix/signal_arm.c | 10 ++++-- 3 files changed, 58 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e740387499e4322e397…

1 0

Alexandre Julliard : ntdll: Fix some exception test failures on ARM64.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: a2fce84a8b137ebdb21041021d82c08efbdd1cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fce84a8b137ebdb2104102… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 11:13:38 2021 +0200 ntdll: Fix some exception test failures on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 24 ++++++++++++++---------- dlls/ntdll/tests/exception.c | 42 +++++++++++++++++++++++------------------- dlls/ntdll/unix/signal_arm64.c | 3 +-- 3 files changed, 38 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2fce84a8b137ebdb210…

1 0

Alexandre Julliard : kernel32: Don't export __chkstk() on ARM64.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: fdd3ef65695987309ddcbb6cd5bcc3394ec245f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd3ef65695987309ddcbb6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 11:20:36 2021 +0200 kernel32: Don't export __chkstk() on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f033cf310c0..ec094c98508 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1651,7 +1651,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long)

1 0

Nguyễn Chính Hữu : wined3d: Add GPU information for NVIDIA GT 1030.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 8854fd2b07b0ac17b1cc3753d3390ee4ef4e7957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8854fd2b07b0ac17b1cc3753… Author: Nguyễn Chính Hữu <huupoke12(a)gmail.com> Date: Thu Jun 10 17:41:08 2021 +0700 wined3d: Add GPU information for NVIDIA GT 1030. Signed-off-by: Nguyễn Chính Hữu <huupoke12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b014790af51..902b9620f30 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1327,6 +1327,7 @@ cards_nvidia_binary[] = {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ {"GTX 1050 Ti", CARD_NVIDIA_GEFORCE_GTX1050TI}, /* GeForce 1000 - midend */ {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ + {"GT 1030", CARD_NVIDIA_GEFORCE_GT1030}, /* GeForce 1000 - lowend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0e8a396a598..a39c6d75750 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -436,6 +436,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_KEPLER, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_KEPLER, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_KEPLER, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT1030, "NVIDIA GeForce GT 1030", DRIVER_NVIDIA_KEPLER, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_KEPLER, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_KEPLER, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060_3GB,"NVIDIA GeForce GTX 1060 3GB", DRIVER_NVIDIA_KEPLER, 3072}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e3be01ed5a..bbc2f4f4db7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3031,6 +3031,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, + CARD_NVIDIA_GEFORCE_GT1030 = 0x1d01, CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, CARD_NVIDIA_GEFORCE_GTX1050TI = 0x1c82, CARD_NVIDIA_GEFORCE_GTX1060_3GB = 0x1c02,

1 0

Rebekka Zwing : Update German IRC translation.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: website Branch: master Commit: 9e8bf7327bf26ddf532a374a85abf38a18bba7e8 URL: https://source.winehq.org/git/website.git/?a=commit;h=9e8bf7327bf26ddf532a3… Author: Rebekka Zwing <rebekka.zwing(a)ok.de> Date: Wed Jun 9 21:30:11 2021 +0200 Update German IRC translation. Signed-off-by: Rebekka Zwing <rebekka.zwing(a)ok.de> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/de/irc.template | 120 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 107 insertions(+), 13 deletions(-) diff --git a/templates/de/irc.template b/templates/de/irc.template index 9a52b52b..2195005f 100644 --- a/templates/de/irc.template +++ b/templates/de/irc.template @@ -1,20 +1,114 @@ - - + -<h1 class="title">Live Support Chat</h1> +<h1 class="title">Live Community Chat</h1> -<p>Auf <a href="http://www.freenode.net">Freenode.net</a> gibt es einen IRC-Kanal für Wine. -Du kannst den Chatroom mit einem IRC-Programm wie z.B. <a href="http://www.xchat.org/">X-Chat</a> -betreten. Verwende folgende Einstellungen:</p> +<p>Auf <a href="https://libera.chat/">Libera.Chat</a> gibt es mehrere +IRC-Kanäle für Wine. Den Chatraum kannst du mit einem IRC-Programm betreten, z.B. +<a href="https://hexchat.github.io/">HexChat</a>. Nutze folgende Einstellungen:</p> <blockquote> - <b>Server:</b> irc.freenode.net<br> - <b>Port:</b> 6667<br> - <b>Channel:</b> #winehq<br> + <b>Server:</b> irc.libera.chat<br> + <b>Port:</b> 6697<br> + <b>TLS:</b> AN </blockquote> -<p>Wenn du Firefox oder einen anderen Browser nutzt der IRC-Urls unterstütz, kannst du den Chat -betreten indem du auf <a href="irc://irc.freenode.net/winehq">irc://irc.freenode.net/winehq</a> -klickst.</p> +<p>Welchen Kanal du wählen solltest hängt davon ab, +welches Thema du erörtern möchtest:</p> -<p> </p> +<blockquote> + <b>#winehq:</b> Unterstützung und Hilfe von anderen Benutzern beim Ausführen von Wine <br> + <b>#crossover:</b> Benutzer-Support und Hilfe beim Ausführen von Crossover <br> + <b>#winehackers:</b> Entwicklung und andere Möglichkeiten um einen Beitrag für Wine zu leisten<br> + <b>#winehq-social:</b> Ungezwungene, andere Themen betreffende Chats, mit verschiedenen Community Mitgliedern<br> +</blockquote> + +<p>Benutzer eines Browsers (z.B. Firefox), der IRC-URLs unterstützt, +können an einem Chat teilnehmen indem sie ihn anklicken:</p> +<ul> + <li><a href="irc://irc.libera.chat/winehq">#winehq</a></li> + <li><a href="irc://irc.libera.chat/crossover">#crossover</a></li> + <li><a href="irc://irc.libera.chat/winehackers">#winehackers</a></li> + <li><a href="irc://irc.libera.chat/winehq-social">#winehq-social</a></li> +</ul> + +<p>Damit Diskussionen so fokussiert und hilfreich wie möglich bleiben, versuche +deine Fragen zu recherchieren, bevor du jemanden im IRC danach fragst. Das +<a href="https://wiki.winehq.org/FAQ">Wine FAQ</a>, +<a href="//appdb.winehq.org">AppDB</a>, und die +<a href="//www.winehq.org/download">Downloadseite</a> sind gute +Optionen, um deine Frage vielleicht selbst zu beantworten.</p> + +<h2>IRC-Regeln und -Strafen</h2> + +<p> Abgesehen davon, dass man sich nicht beleidigend oder offensichtlich Rücksichtslos +verhalten soll, gibt es ein Paar einfache Regeln, die jeder auf IRC einzuhalten hat. +In den meisten Fällen wird ein erster Regelbruch als Versehen aufgefasst und es wird eine +Verwarnung geben. Nachdem du deine Warnungen allerdings aufgebraucht hast, wirst du aus dem Kanal +geworfen.</p> + +<p>Wenn du zu oft rausgeworfen wurdest und weiterhin Regeln brichst, wirst du +für zwei Stunden vom Kanal verbannt. Jegliche Probleme danach +führen zu einer endgültigen Verbannung, welche nur durch einen Einspruch gekippt +werden kann. Wenn du einen Rauswurf anfechten möchtest, gehe auf <b>#winehq-social</b> +(oder auf die <a href="mailto:wine-devel(a)winehq.org">Wine-Devel Mailingliste</a>, wenn du +von <b>#winehq-social</b> verbannt wurdest), und erkläre warum du glaubst, dass dies passiert +ist und warum die Verbannung aufgehoben werden sollte.</p> + +<table class="table"> +<thead> + <tr class="black inverse small"> + <th>Regel</th> + <th>Erläuterung</th> + <th>Verwarnungen</th> + <th>Rauswürfe</th> + </tr> +</thead> +<tbody> + <tr + <td>Bitte nicht spammen.</td> + <td></td> + <td>1</td> + <td>2</td> + </tr> + <tr> + <td>Nutze ein Pastebin, um mehr als eine oder zwei Zeilen zu schicken.</td> + <td></td> + <td>0</td> + <td>5</td> + </tr> + <tr> + <td>Schreibe im passenden Kanal.</td> + <td>Wenn du unsicher bist, frage bei <b>#winehq</b> welcher Kanal der richtige ist.</td> + <td>2</td> + <td>3</td> + </tr> + <tr> + <td>Nur Wine und Crossover werden in den jeweiligen Kanälen + unterstützt.</td> + <td>Sidenet, WineDoors, Cedega, IEs4Linux, etc. werden <b>nicht</b> + unterstützt.</td> + <td>2</td> + <td>1</td> + </tr> + <tr> + <td>Bevor du auf <b>#winehq</b> nach Hilfe fragst, überprüfe, ob du die + neueste Version von Wine nutzt.</td> + <td>Wenn du dir unsicher bist, führe <tt>wine --version</tt> in der Befehlszeile aus, um + deine Version zu ermitteln</td> + <td>3</td> + <td>1</td> + </tr> + <tr> + <td>Bitte warte, bis du an der Reihe bist.</td> + <td></td> + <td>3</td> + <td>1</td> + </tr> + <tr> + <td>Diskutiere <b>nicht</b> über Raubkopien.</td> + <td></td> + <td>1</td> + <td>1</td> + </tr> +</tbody> +</table>

1 0

Zhiyi Zhang : explorer: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

1 0

Zhiyi Zhang : extrac32: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: ed673bdcf56784636aae29d8cf4dfbe52f1ef790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed673bdcf56784636aae29d8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 21:57:40 2021 +0800 extrac32: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/extrac32/Makefile.in | 4 +++- programs/extrac32/extrac32.c | 3 +++ programs/extrac32/extrac32.manifest | 16 ++++++++++++++++ programs/extrac32/extrac32.rc | 25 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index cda7a84253b..3528a0d7599 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -1,7 +1,9 @@ MODULE = extrac32.exe -IMPORTS = shell32 setupapi shlwapi user32 +IMPORTS = shell32 setupapi shlwapi user32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = \ extrac32.c + +RC_SRCS = extrac32.rc diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 278f8ff9bf5..3741f16b3cd 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> +#include <commctrl.h> #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> @@ -226,6 +227,8 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho WCHAR path[MAX_PATH]; LPCWSTR cabfile = NULL; + InitCommonControls(); + path[0] = 0; /* Do not use CommandLineToArgvW() or __wgetmainargs() to parse diff --git a/programs/extrac32/extrac32.manifest b/programs/extrac32/extrac32.manifest new file mode 100644 index 00000000000..5fdae4e453e --- /dev/null +++ b/programs/extrac32/extrac32.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Extrac32" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/extrac32/extrac32.rc b/programs/extrac32/extrac32.rc new file mode 100644 index 00000000000..3526dcb6612 --- /dev/null +++ b/programs/extrac32/extrac32.rc @@ -0,0 +1,25 @@ +/* + * Extrac32 resources + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winuser.h> + +/* @makedep: extrac32.manifest */ +1 RT_MANIFEST extrac32.manifest

1 0

Zhiyi Zhang : msiexec: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 76e448bd7dc147443191b9f652f2f274f44e9fbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e448bd7dc147443191b9f6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 21:57:51 2021 +0800 msiexec: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/Makefile.in | 2 +- programs/msiexec/msiexec.c | 3 +++ programs/msiexec/msiexec.manifest | 16 ++++++++++++++++ programs/msiexec/rsrc.rc | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index e82acc0da74..05b0e0629cc 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -1,5 +1,5 @@ MODULE = msiexec.exe -IMPORTS = msi ole32 advapi32 user32 +IMPORTS = msi ole32 advapi32 user32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2bc0ba9bbef..e25cc2659e6 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -22,6 +22,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <commctrl.h> #include <msi.h> #include <winsvc.h> #include <objbase.h> @@ -626,6 +627,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine int argc; LPWSTR *argvW = NULL; + InitCommonControls(); + /* parse the command line */ process_args( GetCommandLineW(), &argc, &argvW ); diff --git a/programs/msiexec/msiexec.manifest b/programs/msiexec/msiexec.manifest new file mode 100644 index 00000000000..a4a17a5397d --- /dev/null +++ b/programs/msiexec/msiexec.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Msiexec" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index 91c3df8d7ec..9cc45a446ee 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -33,3 +33,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: msiexec.ico */ 1 ICON msiexec.ico + +/* @makedep: msiexec.manifest */ +1 RT_MANIFEST msiexec.manifest

1 0

Zhiyi Zhang : msinfo32: Enable visual styles.
by Alexandre Julliard 09 Jun '21

09 Jun '21

Module: wine Branch: master Commit: 25d25b234e81aa285ca02499ec15b4d26183281e URL: https://source.winehq.org/git/wine.git/?a=commit;h=25d25b234e81aa285ca02499… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 21:58:04 2021 +0800 msinfo32: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msinfo32/Makefile.in | 2 +- programs/msinfo32/main.c | 8 ++++++++ programs/msinfo32/msinfo32.manifest | 16 ++++++++++++++++ programs/msinfo32/msinfo32.rc | 3 +++ programs/msinfo32/resource.h | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in index e3e657baf61..8c36594fa31 100644 --- a/programs/msinfo32/Makefile.in +++ b/programs/msinfo32/Makefile.in @@ -1,5 +1,5 @@ MODULE = msinfo32.exe -IMPORTS = shell32 user32 +IMPORTS = shell32 user32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/msinfo32/main.c b/programs/msinfo32/main.c index 6c307853301..a1f89db2b68 100644 --- a/programs/msinfo32/main.c +++ b/programs/msinfo32/main.c @@ -16,6 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <commctrl.h> #include <shlwapi.h> #include <shellapi.h> @@ -29,6 +35,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) int i; WCHAR system_info[64]; + InitCommonControls(); + WINE_FIXME("stub:"); for (i = 0; i < argc; i++) WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); diff --git a/programs/msinfo32/msinfo32.manifest b/programs/msinfo32/msinfo32.manifest new file mode 100644 index 00000000000..67eb98a2799 --- /dev/null +++ b/programs/msinfo32/msinfo32.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Msinfo32" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/msinfo32/msinfo32.rc b/programs/msinfo32/msinfo32.rc index fc9b46a6cdb..94b1e764d63 100644 --- a/programs/msinfo32/msinfo32.rc +++ b/programs/msinfo32/msinfo32.rc @@ -26,3 +26,6 @@ STRINGTABLE { STRING_SYSTEM_INFO, "System Information" } + +/* @makedep: msinfo32.manifest */ +1 RT_MANIFEST msinfo32.manifest diff --git a/programs/msinfo32/resource.h b/programs/msinfo32/resource.h index 37db7e5e8bc..9ca33da5ec8 100644 --- a/programs/msinfo32/resource.h +++ b/programs/msinfo32/resource.h @@ -17,5 +17,6 @@ */ #include <windef.h> +#include <winuser.h> #define STRING_SYSTEM_INFO 100

1 0