wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Dmitry Timoshkov : server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: b66571e730e137d3989737542b5971cc9112adf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66571e730e137d398973754… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:47 2021 +0300 server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread. I've left another case of returning STATUS_PROCESS_IS_TERMINATING since that's not covered by the tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50704 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 050dc49b3850a9cf807d995c2c8e8c3f244b9f11) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 2 -- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7d6ac030299..f1c5f01fa84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2737,13 +2737,11 @@ static void test_QueueUserAPC(void) ok(ret == WAIT_OBJECT_0, "got %u\n", ret); ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); -todo_wine ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); SetLastError(0xdeadbeef); ret = QueueUserAPC(user_apc, thread, 0); ok(!ret, "QueueUserAPC should fail\n"); -todo_wine ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); CloseHandle(thread); diff --git a/server/thread.c b/server/thread.c index 942a8ff8389..1e32ef8e1fc 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1750,7 +1750,7 @@ DECL_HANDLER(queue_apc) if (thread) { - if (!queue_apc( NULL, thread, apc )) set_error( STATUS_THREAD_IS_TERMINATING ); + if (!queue_apc( NULL, thread, apc )) set_error( STATUS_UNSUCCESSFUL ); release_object( thread ); } else if (process)

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 015f3167d8bf3319e0b619379841b94093c0e788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=015f3167d8bf3319e0b61937… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:44 2021 +0300 kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 816b588e0438f94a3769612739abc9d8d9980537) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2a47abf342c..7d6ac030299 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winternl.h> @@ -60,6 +63,7 @@ static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER lis PSLIST_ENTRY last, ULONG count); static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, PSLIST_ENTRY last, ULONG count); +static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); #ifdef __i386__ @@ -2702,6 +2706,49 @@ static void test_crit_section(void) ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } +static DWORD WINAPI thread_proc(LPVOID unused) +{ + Sleep(INFINITE); + return 0; +} + +static void CALLBACK user_apc(ULONG_PTR unused) +{ +} + +static void CALLBACK call_user_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + PAPCFUNC func = (PAPCFUNC)arg1; + func(arg2); +} + +static void test_QueueUserAPC(void) +{ + HANDLE thread; + DWORD tid, ret; + + thread = CreateThread(NULL, 0, thread_proc, NULL, CREATE_SUSPENDED, &tid); + ok(thread != NULL, "CreateThread error %u\n", GetLastError()); + + ret = TerminateThread(thread, 0xdeadbeef); + ok(ret, "TerminateThread error %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "got %u\n", ret); + + ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); +todo_wine + ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); + + SetLastError(0xdeadbeef); + ret = QueueUserAPC(user_apc, thread, 0); + ok(!ret, "QueueUserAPC should fail\n"); +todo_wine + ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); + + CloseHandle(thread); +} + START_TEST(sync) { char **argv; @@ -2732,6 +2779,7 @@ START_TEST(sync) pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); + pNtQueueApcThread = (void *)GetProcAddress(hntdll, "NtQueueApcThread"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2744,6 +2792,8 @@ START_TEST(sync) } init_fastcall_thunk(); + + test_QueueUserAPC(); test_signalandwait(); test_mutex(); test_slist();

1 0

Bernhard Kölbl : msvcrt: Update source pointer in wcsrtombs in C locale.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 3224e39044106b56dfbc197ccfeeab65ba853080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3224e39044106b56dfbc197c… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 2 12:09:32 2021 +0100 msvcrt: Update source pointer in wcsrtombs in C locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3dca00f1dd7e8ff1abe0a15af3365b4f7c7ae042) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ dlls/msvcrt/wcs.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4d61cff11c0..dbc93dc93f5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2094,6 +2094,22 @@ static void test_mbstowcs(void) ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); ok(!mOut[0], "mOut = %s\n", mOut); + if(pwcsrtombs) { + pwstr = wSimple; + err = -3; + ret = pwcsrtombs(mOut, &pwstr, 4, &err); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(err == 0, "err = %d\n", err); + ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple); + ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut); + + pwstr = wSimple; + ret = pwcsrtombs(mOut, &pwstr, 5, NULL); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(pwstr == NULL, "pwstr != NULL\n"); + ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + } + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..343dec70477 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,9 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; if(!(*wcstr)[i]) break; } + + if(i < count) *wcstr = NULL; + else *wcstr += i; return i; }

1 0

Roman Pišl : cmd: Fix handling of brackets in if-set expressions on a single line.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 780b202907eb4de575b7772b73db1580fa463f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780b202907eb4de575b7772b… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 8 19:06:44 2021 +0100 cmd: Fix handling of brackets in if-set expressions on a single line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50642 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d6b0b67d91b6433744ec859b10b8ee8eb4a37b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4019c51ba73..7cd806c3d54 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1246,6 +1246,11 @@ echo ------------ Testing if/for ------------ if ""=="" for %%i in (A) DO (echo %%i) if not ""=="" for %%i in (B) DO (echo %%i) +echo ------------ Testing if/set ------------ +set x=C:\Program Files (x86) +if ""=="" set y=%x%\dummy +echo %y% + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 129e5313d90..bf5fcddeb9d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -916,6 +916,8 @@ x@space@ --- ------------ Testing if/for ------------ A +------------ Testing if/set ------------ +C:\Program Files (x86)\dummy ------------ Testing for ------------ --- plain FOR A diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fbe8475d8a9..dd7d14e50e5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1817,6 +1817,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forCmd[] = {'f','o','r'}; static const WCHAR ifCmd[] = {'i','f'}; static const WCHAR ifElse[] = {'e','l','s','e'}; + static const WCHAR setCmd[] = {'s','e','t'}; BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; @@ -1829,6 +1830,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE BOOL lastWasElse = FALSE; BOOL lastWasRedirect = TRUE; BOOL lastWasCaret = FALSE; + BOOL ignoreBracket = FALSE; /* Some expressions after if (set) require */ + /* handling brackets as a normal character */ int lineCurDepth; /* Bracket depth when line was read in */ BOOL resetAtEndOfLine = FALSE; /* Do we need to reset curdepth at EOL */ @@ -1957,6 +1960,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curPos+=if_condition_len; } + if (WCMD_keyword_ws_found(setCmd, ARRAY_SIZE(setCmd), curPos)) + ignoreBracket = TRUE; + } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { const int keyw_len = ARRAY_SIZE(ifElse) + 1; inElse = TRUE; @@ -2146,7 +2152,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE In an ELSE statement, only allow it straight away after the ELSE and whitespace */ - } else if (inIf || + } else if ((inIf && !ignoreBracket) || (inElse && lastWasElse && onlyWhiteSpace) || (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace)) {

1 0

Roman Pišl : cmd: Fix handling of nested if-for expressions on a single line.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 907c5a2135b2c94f07b251ff51046cb66709c2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=907c5a2135b2c94f07b251ff… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 8 19:06:43 2021 +0100 cmd: Fix handling of nested if-for expressions on a single line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50641 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6809e0599ef57d30f1a3f87f87cd006ea8d589be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 10 ++++++++-- programs/cmd/tests/test_builtins.cmd | 4 ++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e99dd24ac72..0fb40d94e49 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1599,8 +1599,14 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, the same bracket depth as the IF, then the IF statement is over. This is required to handle nested ifs properly */ } else if (isIF && (*cmdList)->bracketDepth == myDepth) { - WINE_TRACE("Found end of this nested IF statement, ending this if\n"); - break; + static const WCHAR doW[] = {'d','o'}; + if (WCMD_keyword_ws_found(doW, ARRAY_SIZE(doW), (*cmdList)->command)) { + WINE_TRACE("Still inside FOR-loop, not an end of IF statement\n"); + *cmdList = (*cmdList)->nextcommand; + } else { + WINE_TRACE("Found end of this nested IF statement, ending this if\n"); + break; + } } else if (!processThese) { if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; WINE_TRACE("Skipping this command, as in not process mode (next = %p)\n", *cmdList); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c7418b759e4..4019c51ba73 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1242,6 +1242,10 @@ goto :eof set WINE_STR_PARMS= set WINE_INT_PARMS= +echo ------------ Testing if/for ------------ +if ""=="" for %%i in (A) DO (echo %%i) +if not ""=="" for %%i in (B) DO (echo %%i) + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index f75839fdbe8..129e5313d90 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -914,6 +914,8 @@ x@space@ --- x@space@ --- +------------ Testing if/for ------------ +A ------------ Testing for ------------ --- plain FOR A

1 0

Henri Verbeet : wined3d: Set the "compareEnable" field of struct VkSamplerCreateInfo to either 0 or 1.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: d0a38a32c77a05da0ee40b06461cfab4f5fdfdc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a38a32c77a05da0ee40b06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:32 2021 +0100 wined3d: Set the "compareEnable" field of struct VkSamplerCreateInfo to either 0 or 1. VkBool32 is (unfortunately) specified as 0/1, instead of zero/non-zero. Found by the validation layers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f969570c22829351f4afeabb4fee55adce799ad8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/sampler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 8d909627a18..74f00b808fa 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -200,7 +200,7 @@ static void wined3d_sampler_vk_cs_init(void *object) sampler_desc.mipLodBias = desc->lod_bias; sampler_desc.anisotropyEnable = desc->max_anisotropy != 1; sampler_desc.maxAnisotropy = desc->max_anisotropy; - sampler_desc.compareEnable = desc->compare; + sampler_desc.compareEnable = !!desc->compare; sampler_desc.compareOp = vk_compare_op_from_wined3d(desc->comparison_func); sampler_desc.minLod = desc->min_lod; sampler_desc.maxLod = desc->max_lod;

1 0

Matteo Bruni : wined3d: Use VK_FORMAT_D24_UNORM_S8_UINT when available.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 43e4f4b81e0f54709aa11fe57a7dce3e15f7718a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e4f4b81e0f54709aa11fe5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 10 20:50:15 2021 +0100 wined3d: Use VK_FORMAT_D24_UNORM_S8_UINT when available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4bc4df09f414ee44b293f942015e6e20a58c0f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/utils.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3974eeb1fcc..58f214b51ca 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4142,7 +4142,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, - {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; @@ -4177,6 +4177,17 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, format->f.color_fixup = COLOR_FIXUP_IDENTITY; VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); + if (vk_format == VK_FORMAT_D24_UNORM_S8_UINT) + { + if (~properties.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + { + /* AMD doesn't support VK_FORMAT_D24_UNORM_S8_UINT. */ + WARN("Mapping VK_FORMAT_D24_UNORM_S8_UINT to VK_FORMAT_D32_SFLOAT_S8_UINT.\n"); + + format->vk_format = vk_format = VK_FORMAT_D32_SFLOAT_S8_UINT; + VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); + } + } if (properties.bufferFeatures & VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT) format->f.flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE;

1 0

Bernhard Kölbl : netprofm: Set correct GUIDs for network connections.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 597a3b414e2a6b783653af56a495d98c6ed9b94b URL: https://source.winehq.org/git/wine.git/?a=commit;h=597a3b414e2a6b783653af56… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Mar 5 16:22:07 2021 +0100 netprofm: Set correct GUIDs for network connections. Retrieve the network connection's GUID from the interface index. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4393438ab31e8825edf4111524ef5a0be0a90d00) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/netprofm/list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index f9b9e2ea312..828d8cebeb2 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1736,8 +1736,10 @@ static void init_networks( struct list_manager *mgr ) { struct network *network; struct connection *connection; + NET_LUID luid; - id.Data1 = aa->u.s.IfIndex; + ConvertInterfaceIndexToLuid(aa->u.s.IfIndex, &luid); + ConvertInterfaceLuidToGuid(&luid, &id); /* assume a one-to-one mapping between networks and connections */ if (!(network = create_network( &id ))) goto done;

1 0

Alistair Leslie-Hughes : msado15: Implement Dispatch functions in _Connection.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 3d74e4b563a74652ce19ce30d32a0a13a669ee65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d74e4b563a74652ce19ce30… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 26 19:02:21 2021 +1100 msado15: Implement Dispatch functions in _Connection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=16676 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 079a963a278593131f3f299898ea60b00a254844) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 46 +++++++++++++++++++++++++++++-------- dlls/msado15/main.c | 51 ++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/msado15_private.h | 7 ++++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index fd15d5a443f..102d98942eb 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -145,29 +145,57 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid static HRESULT WINAPI connection_GetTypeInfoCount( _Connection *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI connection_GetTypeInfo( _Connection *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %u, %u, %p\n", connection, index, lcid, info ); + return get_typeinfo(Connection_tid, info); } static HRESULT WINAPI connection_GetIDsOfNames( _Connection *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", connection, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI connection_Invoke( _Connection *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, - result, excep_info, arg_err ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", connection, member, debugstr_guid(riid), lcid, flags, + params, result, excep_info, arg_err ); + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &connection->Connection_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties **obj ) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 770a02fc59d..0bfaff2821a 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -173,3 +173,54 @@ HRESULT WINAPI DllUnregisterServer( void ) { return __wine_unregister_resources( hinstance ); } + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID__Connection, +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + if(typelib) + return S_OK; + + hres = LoadRegTypeLib(&LIBID_ADODB, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (FAILED(hres = load_typelib())) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f6c60f0304c..feed4add68e 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -40,4 +40,11 @@ static inline WCHAR *strdupW( const WCHAR *src ) return dst; } +typedef enum tid_t { + Connection_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + #endif /* _WINE_MSADO15_PRIVATE_H_ */

1 0

Alexandre Julliard : ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: aff5e8fb75ac938844c9995402047c82600f18e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff5e8fb75ac938844c99954… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 17:20:02 2021 +0100 ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d89b304eb703a7eb0eefb3b759497a7747f5cc6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/loader.c | 53 +++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3f43062f9f8..1f8e6c24400 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2889,41 +2889,26 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count #elif defined(__arm__) case IMAGE_REL_BASED_THUMB_MOV32: { - DWORD inst = *(INT_PTR *)((char *)page + offset); - DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - DWORD hi_delta; - - if ((inst & 0x8000fbf0) != 0x0000f240) - ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); - - imm16 += LOWORD(delta); - hi_delta = HIWORD(delta) + HIWORD(imm16); - *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - - if (hi_delta != 0) - { - inst = *(INT_PTR *)((char *)page + offset + 4); - imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - - if ((inst & 0x8000fbf0) != 0x0000f2c0) - ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); - - imm16 += hi_delta; - if (imm16 > 0xffff) - ERR("resulting immediate value won't fit: %08x\n", imm16); - *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) + - ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - } - } + DWORD *inst = (DWORD *)((char *)page + offset); + WORD lo = ((inst[0] << 1) & 0x0800) + ((inst[0] << 12) & 0xf000) + + ((inst[0] >> 20) & 0x0700) + ((inst[0] >> 16) & 0x00ff); + WORD hi = ((inst[1] << 1) & 0x0800) + ((inst[1] << 12) & 0xf000) + + ((inst[1] >> 20) & 0x0700) + ((inst[1] >> 16) & 0x00ff); + DWORD imm = MAKELONG( lo, hi ) + delta; + + lo = LOWORD( imm ); + hi = HIWORD( imm ); + + if ((inst[0] & 0x8000fbf0) != 0x0000f240 || (inst[1] & 0x8000fbf0) != 0x0000f2c0) + ERR("wrong Thumb2 instruction @%p %08x:%08x, expected MOVW/MOVT\n", + inst, inst[0], inst[1] ); + + inst[0] = (inst[0] & 0x8f00fbf0) + ((lo >> 1) & 0x0400) + ((lo >> 12) & 0x000f) + + ((lo << 20) & 0x70000000) + ((lo << 16) & 0xff0000); + inst[1] = (inst[1] & 0x8f00fbf0) + ((hi >> 1) & 0x0400) + ((hi >> 12) & 0x000f) + + ((hi << 20) & 0x70000000) + ((hi << 16) & 0xff0000); break; + } #endif default: FIXME("Unknown/unsupported fixup type %x.\n", type);

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
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