wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Zebediah Figura : server: Do not return the socket state from get_socket_event.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 830fc41fbb619924f89d50de539d86c9565513e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=830fc41fbb619924f89d50de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:23 2021 -0500 server: Do not return the socket state from get_socket_event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 4 +--- server/protocol.def | 1 - server/request.h | 3 +-- server/sock.c | 1 - server/trace.c | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fe1f5394a72..a97974027f1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1758,9 +1758,7 @@ struct get_socket_event_reply struct reply_header __header; unsigned int mask; unsigned int pmask; - unsigned int state; /* VARARG(errors,ints); */ - char __pad_20[4]; }; @@ -6294,7 +6292,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 711 +#define SERVER_PROTOCOL_VERSION 712 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 30624a7cbaf..3609261b848 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1441,7 +1441,6 @@ enum server_fd_type @REPLY unsigned int mask; /* event mask */ unsigned int pmask; /* pending events */ - unsigned int state; /* status bits */ VARARG(errors,ints); /* event errors */ @END diff --git a/server/request.h b/server/request.h index a8d74f01f96..4f6adaa97c2 100644 --- a/server/request.h +++ b/server/request.h @@ -1052,8 +1052,7 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 ); C_ASSERT( sizeof(struct get_socket_event_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, mask) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, pmask) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, state) == 16 ); -C_ASSERT( sizeof(struct get_socket_event_reply) == 24 ); +C_ASSERT( sizeof(struct get_socket_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_socket_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, family) == 8 ); diff --git a/server/sock.c b/server/sock.c index b4649abbf08..bbd82d57bd5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2376,7 +2376,6 @@ DECL_HANDLER(get_socket_event) if (get_unix_fd( sock->fd ) == -1) return; reply->mask = sock->mask; reply->pmask = sock->pending_events; - reply->state = sock->state; set_reply_data( sock->errors, min( get_reply_max_size(), sizeof(sock->errors) )); if (req->service) diff --git a/server/trace.c b/server/trace.c index 1c51bffe1aa..42952d3cdff 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2093,7 +2093,6 @@ static void dump_get_socket_event_reply( const struct get_socket_event_reply *re { fprintf( stderr, " mask=%08x", req->mask ); fprintf( stderr, ", pmask=%08x", req->pmask ); - fprintf( stderr, ", state=%08x", req->state ); dump_varargs_ints( ", errors=", cur_size ); } @@ -5391,6 +5390,7 @@ static const struct { "ABANDONED_WAIT_0", STATUS_ABANDONED_WAIT_0 }, { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, + { "ADDRESS_ALREADY_ASSOCIATED", STATUS_ADDRESS_ALREADY_ASSOCIATED }, { "ALERTED", STATUS_ALERTED }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, { "BAD_IMPERSONATION_LEVEL", STATUS_BAD_IMPERSONATION_LEVEL },

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_InitializeReportForID tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: c1b80538b3d914ec6bdb6fb0c4c4ae1b0e29d6f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b80538b3d914ec6bdb6fb0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:28 2021 +0200 ntoskrnl.exe/tests: Add some HidP_InitializeReportForID tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6a73493aa39..ff73e8eae18 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1720,8 +1720,8 @@ static void test_hidp(HANDLE file) PHIDP_PREPARSED_DATA preparsed_data; HIDP_BUTTON_CAPS button_caps[16]; HIDP_VALUE_CAPS value_caps[16]; + char buffer[200], report[200]; DWORD collection_count; - char buffer[200]; NTSTATUS status; HIDP_CAPS caps; unsigned int i; @@ -1952,6 +1952,23 @@ static void test_hidp(HANDLE file) ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); + status = HidP_InitializeReportForID(HidP_Input, 0, (PHIDP_PREPARSED_DATA)buffer, report, sizeof(report)); + ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Feature + 1, 0, preparsed_data, report, sizeof(report)); + ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, sizeof(report)); + ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength + 1); + ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); + + memset(report, 0xcd, sizeof(report)); + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); + + memset(buffer, 0xcd, sizeof(buffer)); + memset(buffer, 0, caps.InputReportByteLength); + ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); }

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_GetLinkCollectionNodes tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 49f4db5e1af42d422408c30a2340ec344eddb9fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f4db5e1af42d422408c30a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:27 2021 +0200 ntoskrnl.exe/tests: Add some HidP_GetLinkCollectionNodes tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c931f5a02d0..6a73493aa39 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1524,6 +1524,20 @@ static inline void check_hidp_caps_(int line, HIDP_CAPS *caps, const HIDP_CAPS * check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureDataIndices); } +#define check_hidp_link_collection_node(a, b) check_hidp_link_collection_node_(__LINE__, a, b) +static inline void check_hidp_link_collection_node_(int line, HIDP_LINK_COLLECTION_NODE *node, + const HIDP_LINK_COLLECTION_NODE *exp) +{ + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsage); + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsagePage); + check_member_(__FILE__, line, *node, *exp, "%d", Parent); + check_member_(__FILE__, line, *node, *exp, "%d", NumberOfChildren); + check_member_(__FILE__, line, *node, *exp, "%d", NextSibling); + check_member_(__FILE__, line, *node, *exp, "%d", FirstChild); + check_member_(__FILE__, line, *node, *exp, "%d", CollectionType); + check_member_(__FILE__, line, *node, *exp, "%d", IsAlias); +} + #define check_hidp_button_caps(a, b) check_hidp_button_caps_(__LINE__, a, b) static inline void check_hidp_button_caps_(int line, HIDP_BUTTON_CAPS *caps, const HIDP_BUTTON_CAPS *exp) { @@ -1693,10 +1707,20 @@ static void test_hidp(HANDLE file) .NotRange.DataIndex = 10, }, }; + static const HIDP_LINK_COLLECTION_NODE expect_collections[] = + { + { + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 1, + }, + }; + HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; HIDP_BUTTON_CAPS button_caps[16]; HIDP_VALUE_CAPS value_caps[16]; + DWORD collection_count; char buffer[200]; NTSTATUS status; HIDP_CAPS caps; @@ -1714,6 +1738,27 @@ static void test_hidp(HANDLE file) ok(status == HIDP_STATUS_SUCCESS, "HidP_GetCaps returned %#x\n", status); check_hidp_caps(&caps, &expect_hidp_caps); + collection_count = 0; + status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); + ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes returned %#x\n", status); + todo_wine + ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", + collection_count, caps.NumberLinkCollectionNodes); + collection_count = ARRAY_SIZE(collections); + status = HidP_GetLinkCollectionNodes(collections, &collection_count, (PHIDP_PREPARSED_DATA)buffer); + ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetLinkCollectionNodes returned %#x\n", status); + status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status); + ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", + collection_count, caps.NumberLinkCollectionNodes); + + for (i = 0; i < ARRAY_SIZE(expect_collections); ++i) + { + winetest_push_context("collections[%d]", i); + check_hidp_link_collection_node(collections + i, expect_collections + i); + winetest_pop_context(); + } + count = ARRAY_SIZE(button_caps); status = HidP_GetButtonCaps(HidP_Output, button_caps, &count, preparsed_data); todo_wine

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_Get(Specific)ValueCaps tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 3e36af2e965a06aecde518b774f84782c10d8ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e36af2e965a06aecde518b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:26 2021 +0200 ntoskrnl.exe/tests: Add some HidP_Get(Specific)ValueCaps tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 199 +++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e36af2e965a06aecde5…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_Get(Specific)ButtonCaps tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 3b96cb8baed323dbd54c44370512b5cc4e7e5bf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b96cb8baed323dbd54c4437… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:25 2021 +0200 ntoskrnl.exe/tests: Add some HidP_Get(Specific)ButtonCaps tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 218 ++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b96cb8baed323dbd54c…

1 0

Rémi Bernon : hid: Check preparsed data magic in HidP_GetLinkCollectionNodes.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: dec362a766fbf5d6774dd699b6044841e042f8a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec362a766fbf5d6774dd699… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:24 2021 +0200 hid: Check preparsed data magic in HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index a7003717a21..2933c2ff7ef 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -1001,6 +1001,9 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkColle TRACE("(%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (*LinkCollectionNodeLength < data->caps.NumberLinkCollectionNodes) return HIDP_STATUS_BUFFER_TOO_SMALL;

1 0

Zhiyi Zhang : wineboot: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: b99da49a7510ce42e583a31ed4dc3e55a9388902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b99da49a7510ce42e583a31e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:49 2021 +0800 wineboot: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.manifest | 16 ++++++++++++++++ programs/wineboot/wineboot.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/wineboot/wineboot.manifest b/programs/wineboot/wineboot.manifest new file mode 100644 index 00000000000..6e5892ae6ac --- /dev/null +++ b/programs/wineboot/wineboot.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.Wineboot" 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/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 93083c32b36..898926203db 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -45,3 +45,6 @@ BEGIN LTEXT "The Wine configuration in %s is being updated, please wait...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END + +/* @makedep: wineboot.manifest */ +1 RT_MANIFEST wineboot.manifest

1 0

Zhiyi Zhang : view: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: d271efe01295e2c5113d87fab1faf91b4e313df7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d271efe01295e2c5113d87fa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:39 2021 +0800 view: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/Makefile.in | 2 +- programs/view/resource.h | 1 + programs/view/view.c | 3 +++ programs/view/view.manifest | 16 ++++++++++++++++ programs/view/view.rc | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 7e9ff33e2d1..ce55999c1a9 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -1,5 +1,5 @@ MODULE = view.exe -IMPORTS = comdlg32 user32 gdi32 +IMPORTS = comdlg32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/view/resource.h b/programs/view/resource.h index 1cfaf5fca11..76f940d1fad 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -17,6 +17,7 @@ */ #include <windef.h> +#include <winuser.h> #define IDS_DESCRIPTION 2 #define IDS_OPEN_META_STRING 3 diff --git a/programs/view/view.c b/programs/view/view.c index ad29734828b..1e5c7daa8cf 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -17,6 +17,7 @@ */ #include <windows.h> +#include <commctrl.h> #include <commdlg.h> #include <stdio.h> @@ -403,6 +404,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd { MSG msg; + InitCommonControls(); + /* Other instances of app running? */ if (!hPrevInstance) { diff --git a/programs/view/view.manifest b/programs/view/view.manifest new file mode 100644 index 00000000000..198ffbfc055 --- /dev/null +++ b/programs/view/view.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.View" 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/view/view.rc b/programs/view/view.rc index 39971dd555f..19a778c8036 100644 --- a/programs/view/view.rc +++ b/programs/view/view.rc @@ -48,3 +48,6 @@ BEGIN IDS_DESCRIPTION "Regular Metafile Viewer" IDS_OPEN_META_STRING "Metafiles (*.wmf, *.emf)" END + +/* @makedep: view.manifest */ +1 RT_MANIFEST view.manifest

1 0

Zhiyi Zhang : taskmgr: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 3058bac5e9506a888a1ddf2e137b9c44cefc1ce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3058bac5e9506a888a1ddf2e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:22 2021 +0800 taskmgr: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/taskmgr.c | 2 ++ programs/taskmgr/taskmgr.manifest | 16 ++++++++++++++++ programs/taskmgr/taskmgr.rc | 3 +++ 3 files changed, 21 insertions(+) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index e71d4c9ee9d..d779e5d893a 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -999,6 +999,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HANDLE hToken; TOKEN_PRIVILEGES tkp; + InitCommonControls(); + /* Initialize global variables */ hInst = hInstance; diff --git a/programs/taskmgr/taskmgr.manifest b/programs/taskmgr/taskmgr.manifest new file mode 100644 index 00000000000..b93212bc931 --- /dev/null +++ b/programs/taskmgr/taskmgr.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.Taskmgr" 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/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index ffd0699f80d..ccabf34477e 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -571,6 +571,9 @@ END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: taskmgr.manifest */ +1 RT_MANIFEST taskmgr.manifest + /* Icon */

1 0

Zhiyi Zhang : regedit: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: f623608f9f4cd5d44eb3dece660fc25a695231ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f623608f9f4cd5d44eb3dece… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:14 2021 +0800 regedit: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 ++ programs/regedit/regedit.manifest | 16 ++++++++++++++++ programs/regedit/regedit.rc | 3 +++ 3 files changed, 21 insertions(+) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index df92a13ab69..d9f81218acb 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -142,6 +142,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi HACCEL hAccel; BOOL is_wow64; + InitCommonControls(); + if (ProcessCmdLine(GetCommandLineW())) { return 0; } diff --git a/programs/regedit/regedit.manifest b/programs/regedit/regedit.manifest new file mode 100644 index 00000000000..a2c1a437027 --- /dev/null +++ b/programs/regedit/regedit.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.Regedit" 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/regedit/regedit.rc b/programs/regedit/regedit.rc index 4e629b7d878..d7dd7c4b49e 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -434,6 +434,9 @@ STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: regedit.manifest */ +1 RT_MANIFEST regedit.manifest + /* @makedep: folderopen.ico */ IDI_OPEN_FILE ICON folderopen.ico

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
82
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 2021