-
-
Notifications
You must be signed in to change notification settings - Fork 2k
[WIDL][WPP][RPCRT4] Sync to wine-10.0 #8305
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
This makes reactos hang: https://build.reactos.org/#/builders/6/builds/38866 |
|
Found the commit which is causing the issue: https://gitlab.winehq.org/wine/wine/-/commit/4d8ee6bb18f42e125ffd51a28348687e55b56776 |
This was added only in wine-9.6. Can you sync to wine-9.5? We can then address rpcrt4 separately. |
|
Wine-9.5 has the same issue |
d4702e1 to
a2cebcc
Compare
| /* Append the SWITCHTYPE attribute to a non-encapsulated union if it does not already have it. */ | ||
| if (type_get_type_detect_alias(type) == TYPE_UNION && | ||
| is_attr(attrs, ATTR_SWITCHTYPE) && | ||
| !is_attr(type->attrs, ATTR_SWITCHTYPE)) | ||
| type->attrs = append_attr(type->attrs, make_attrp(ATTR_SWITCHTYPE, get_attrp(attrs, ATTR_SWITCHTYPE))); | ||
| type->attrs = append_attr(type->attrs, attr_ptr( where, ATTR_SWITCHTYPE, get_attrp(attrs, ATTR_SWITCHTYPE) )); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding this back fixed boot, rpcrt4 sync is not required.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is inside an ifdef REACTOS?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes
|
Test KVM x86: https://reactos.org/testman/compare.php?ids=103745,103749 |
a2cebcc to
b0deea7
Compare
|
Switching to the -Oicf stub mode instead of -Os fixed these crashes. |
b0deea7 to
e16de37
Compare
@tkreuzer Would this be acceptable? |
This is what And the wine-9.8 release notes say: So I guess this is the right thing to do. |
|
New testrun: https://reactos.org/testman/compare.php?ids=104147,104157,104165,104190 |
e16de37 to
147641c
Compare
a293394 to
a69e741
Compare
a69e741 to
8265542
Compare
DarkFire01
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WinRT time 👍
lol
| realloc(pXlatTables->RefIdToPointer.StateTable, RefId * 2); | ||
| if (!pXlatTables->RefIdToPointer.XlatTable || !pXlatTables->RefIdToPointer.StateTable) | ||
| { | ||
| pXlatTables->RefIdToPointer.NumberOfEntries = 0; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can observe that their code is kind of buggy in case one of the reallocs failed. Because according to specs, if realloc fails, it returns NULL and the original pointer (the one passed in its 1st argument) is still valid and still points to the old (valid) buffer.
However here in the code, they directly do: ptr = realloc(ptr, newsize); and so, if the realloc fails, it overwrites the pointer with NULL, and we loose the pointer to the underlying buffer, still existing but now lost (and leaked).
32587e0 to
2e0f963
Compare
2e0f963 to
6b1e81c
Compare
Update widl/wpp tools to Wine-10.0. This is needed for compiling WinRT idl files, and for various winesyncs.
[WINESYNC] include: Use __has_declspec_attribute in basetsd.h. wine commit id 8c4ccad0ab3206a0edbe1ed8a7f906d9c1efcd09 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] include: Add DECLSPEC_UUID/DECLSPEC_NOVTABLE to MIDL_INTERFACE. wine commit id 5b87af399d5ca69a8740d068321b9723b1f8200c by Rémi Bernon <rbernon@codeweavers.com> [WINESYNC] include: Use winnt.h DECLSPEC_NOVTABLE definition in rpcndr.h. wine commit id e14f129ac7169a5feca310101867e288ed8cd356 by Rémi Bernon <rbernon@codeweavers.com> [WINESYNC] include: Use winnt.h DECLSPEC_UUID definition in rpcndr.h. wine commit id 6a9ce35e7bfb2cc8e91983eb44366f086934f571 by Rémi Bernon <rbernon@codeweavers.com> [WINESYNC] rpcrt4/tests: Allocate stub buffers with NdrOleAllocate. This fixes crashes on Windows 7-10. wine commit id e280366e146c58118bd8785c079881738ad55935 by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4/tests: Test whether Ndr(Get|Free)Buffer calls StubMsg.pfn(Allocate|Free). wine commit id 05453b10761486b7efe9dde41367be416ce6c28a by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4/tests: Correct a comment in test_pointer_marshal. NdrFree is an internal Wine function. wine commit id 0ca04e1959ca89d99366d9d66a58fde6b8b20525 by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4: Move call_server_func() to a separate file. And build it as x86-64 code on ARM64EC. wine commit id 6647987edc71209731399a1025a576cc80188169 by Alexandre Julliard <julliard@winehq.org> WIP (move all to thunks-msvc.s) [WINESYNC] rpcrt4: Move call_server_func() to a separate file. And build it as x86-64 code on ARM64EC. wine commit id 6647987edc71209731399a1025a576cc80188169 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Move the stubless delegating thunks to a separate file. And build them as x86-64 code on ARM64EC. wine commit id fb8ae8ca35b5ce77cdbce5c60b900fafddcc35cb by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Move the stubless client thunks to a separate file. And build them as x86-64 code on ARM64EC. wine commit id d28f4fd0ecf5818d542dcd6fe5ca7d3d65f1b8f1 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Extend 8- and 16-bit parameters on ARM. wine commit id 28cb539ef9b2ea4a262d3994a0a077c4b4a26296 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Generate the parameter extension data for typelibs on ARM platforms. wine commit id 00756efcfbf07c80373b7a82fdcc6253e48e555e by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Fix stack alignment and by-value parameters for typelibs on ARM platforms. wine commit id 486068560eb23a70061f4d383919a19d0f671e5e by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Stop passing the actual FPU regs pointer to client call functions. wine commit id e4b7eeaad4b0d6c2b9a024d14fe10a25a28630d5 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Remap registers to the stack for stubless proxies on ARM platforms. wine commit id 889767ce35ab1e26e5a910d670db37c143043f9a by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Move the FPU register conversion to the stubless proxy wrapper. wine commit id d9067a8ae45190b1195efbae352a2015d8af48f3 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Add a wrapper for client calls from stubless proxies. wine commit id a8ad671baed45325f6c6987f37e872767ed8f59f by Alexandre Julliard <julliard@winehq.org> [WINESYNC] include: Update a couple of RPC structures. wine commit id 522cecf67cd81496bc56a35fc60a799f3f8b79de by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Leave some space on the stack for varargs when called from ARM64EC code. wine commit id 3c8fc4927d7253c06aeb7147da759a2f3d5ff171 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Support calling server functions with floating point arguments on ARM platforms. wine commit id b684bd24d2544180813ca396bf4fe72beffd1183 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Implement Ndr64AsyncClientCall in assembly on all platforms. wine commit id b2564ffcd928ff2da6cfea3bbaeffdb5f33e1118 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Implement NdrAsyncClientCall in assembly on all platforms. wine commit id 8980dc0fd5d54492fe5ff14ed2e248367d839858 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Implement NdrClientCall3 in assembly on all platforms. wine commit id 19548ad5124593daaa43ca351b5c9f02ee2e2bd2 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Implement NdrClientCall2 in assembly on all platforms. wine commit id e994c8ef741ce28ac6971ea5ff6a131c483f0fd7 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Export NdrpClientCall2. wine commit id 2fff2c6b4a5bde69f9438e11191a24fb5439d8b9 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4/tests: Add some more parameter passing tests. wine commit id 4fc1591fc6f78e5e2bb8ecd9ad0f89ffee6a8084 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] widl: Add /robust flags in correlation descriptors. wine commit id 4d8ee6bb18f42e125ffd51a28348687e55b56776 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Make sure that the stack is set when catching an exception. Fixes a test crash in interpreted mode. wine commit id 8bac669056d2e810e6969ad7339fdc572b0ce93b by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Return the correct failure for a NULL binding handle. Fixes a test crash in interpreted mode. wine commit id 2d801c46c76bbf6fa9fed9988222aa5cfb249b57 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] widl: Don't skip a pointer level for pointers to pointers to strings. wine commit id 69849bd2ee7bd2f180f3a9199fccf2a2c76d9751 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] include: Annotate NdrGetBuffer with __WINE_(ALLOC_SIZE|MALLOC). It would be nice to annotate it with __WINE_DEALLOC(NdrFreeBuffer) too, but that causes a bunch of spurious -Wfree-nonheap-object warnings. wine commit id e7364e2165924c393055cc3f9f910aa347556bd6 by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4/tests: Fix some malloc/HeapAlloc mismatches. Fixes regressions caused by a38e05636df9596ff3e41301c771fe93523808f1. wine commit id 18bdd435f12714859794da49ba52806f37a120f2 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Force debug info in critical sections. wine commit id 139d624787a2c629cf640a413c4faabfc2bf40b4 by Paul Gofman <pgofman@codeweavers.com> WIP reduce diff CONST_VTABLE [WINESYNC] rpcrt4/tests: Use CRT allocation functions. wine commit id a38e05636df9596ff3e41301c771fe93523808f1 by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC]: rpcrt4 is now in sync with wine-staging wine-9.0 [WINESYNC] rpcrt4/tests: Test explicit_handle. wine commit id 6b6aff83221d38167488b48adf4f8e12e0039f07 by Haoyang Chen <chenhaoyang@kylinos.cn> [WINESYNC] rpcrt4: Support for explicit handle passing. If explicit_handle is defined in the idl file, c/s use explicit handles, then an explicit handle must be passed in to the server-side interface wine commit id 9a4de1b727cf7b8226f23e056932f99c53246572 by Haoyang Chen <chenhaoyang@kylinos.cn> [WINESYNC] include: Make strict prototypes the default. wine commit id 240e4387e81e0b139138ee2631ac6822acddffbc by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Remove DECLSPEC_HIDDEN usage. wine commit id 9b26ea16a3fc13118c4c4eaab6ea46d3828ea503 by Alistair Leslie-Hughes <leslie_alistair@hotmail.com> [WINESYNC] rpcrt4: Generate vtbl delegating thunks at compile time. wine commit id 00fb82c315342b87be5aca97f63927acf85b4df8 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Generate stubless thunks at compile time. wine commit id 439ce3a3aed17fcb41013e7e3e0271e36e5df321 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] include: Remove DECLSPEC_HIDDEN from GUID definitions. wine commit id 19cc2439ede6562613d03d75305ddbbe03d11152 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] include: Remove DECLSPEC_HIDDEN from GUID definitions. wine commit id 19cc2439ede6562613d03d75305ddbbe03d11152 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] include: Remove DECLSPEC_HIDDEN from RPC functions. wine commit id 30ce97dd20ef3876eafa40a85994ddaba1194a9c by Alexandre Julliard <julliard@winehq.org> [WINESYNC] include: Remove DECLSPEC_HIDDEN from winecrt0 functions. wine commit id d597d04924a79e67e49d63ce5790fb1fe3e39d5e by Alexandre Julliard <julliard@winehq.org> [WINESYNC] include: Annotate MIDL_user_allocate with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). wine commit id f27ac1bb777aa74c82d91203a06591299e6fef3d by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4: Add SEH annotations to ARM64 assembly code. wine commit id 3acb058a558ee687ca9c67175bf1490bddf34016 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4/tests: Use nameless unions/structs. wine commit id a345f985c0ef46aac6e2a7a01b6950f39ba08a6a by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Use nameless union/structs. wine commit id d8e35c51c9be00cf549044d2299d43edb98dbf3a by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Don't use GetProcAddress for ole32 functions. It's more elegant to put ole32 in the DELAYIMPORTS. wine commit id f0b0c7f4641d129e6b306534084e77cc4cfd1e94 by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4: Replace RPCRT4_strndupA with strdup. wine commit id 3fd8c85fd19ec7498f1151e0a504a637f462221f by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4: Avoid casting an object to IUnknown. Cast its interface member to IUnknown instead. wine commit id 70a847248feb7008b994588574a4aff320af93c1 by Dmitry Timoshkov <dmitry@baikal.ru> [WINESYNC] rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer(). wine commit id 4ec4bdff7365193f71806f7fc0c31c0cbf724a57 by Dmitry Timoshkov <dmitry@baikal.ru> [WINESYNC] rpcrt4/tests: Remove a failing test. wine commit id fc6af061faf1dadeb4193a91a0d7145d10bbb54f by Huw Davies <huw@codeweavers.com> [WINESYNC] rpcrt4: Use CONTAINING_RECORD in release_delegating_vtbl(). wine commit id fe8f63ce729db45f5dd05699540b0e3778a8e17d by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Use a flexible array member in struct delegating_vtbl. wine commit id 10bbf79d53ae4c668b1737655b5fbe299d4f9d0d by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Rename "ref_counted_vtbl" to "struct delegating_vtbl". Get rid of the typedef, and give it a slightly more salient name (and one that matches more of the surrounding code). wine commit id e85afda3b5212a0398cb2dd105e232cfdbfc1329 by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Use a CONTAINING_RECORD helper to retrieve CInterfaceStubHeader from CStdStubBuffer. wine commit id 4ad5de28419228868b734e29d915e450de83c1b2 by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Use a CONTAINING_RECORD helper to retrieve CStdStubBuffer from IRpcStubBuffer. wine commit id 180edc5a4f31e1e2846c25fd9788dbda1648e659 by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC]: rpcrt4 is now in sync with wine-staging wine-8.0 [WINESYNC] rpcrt4/tests: Avoid invalid free of static string. wine commit id 3356ba6810513cd19e87b4d773458f1894e6d6f1 by Rémi Bernon <rbernon@codeweavers.com> [WINESYNC] rpcrt4: Fix GCC12.2 warnings. GCC12.2 warns about dereferencing a pointer to RpcPktHdr while it has been allocated to the size of one of the packet (hence smaller in some cases). /home/eric/work/wine/dlls/rpcrt4/rpc_message.c:111:26: warning: array subscript 'RpcPktHdr[0]' is partly outside array bounds of 'unsigned char[24]' [-Warray-bounds] 111 | Header->common.rpc_ver = RPC_VER_MAJOR; This patch fixes the warnings by accessing the created object through a pointer to their type (and not through the union). Signed-off-by: Eric Pouech <eric.pouech@gmail.com> wine commit id 7ffcd6609f5e8524caff214147ec683a59ed473b by Eric Pouech <eric.pouech@gmail.com> [WINESYNC] rpcrt4: Pass a common header to RPCRT4_BuildCommonHeader. Signed-off-by: Eric Pouech <eric.pouech@gmail.com> wine commit id 5d2547cef492e337830dffb1a96827ea0e95612c by Eric Pouech <eric.pouech@gmail.com> [WINESYNC] include: Use proper dllimports for rpcrt4 functions. wine commit id 9fc9c91bf47948f2f35699fe2956955d609198d5 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Use standard C functions for memory allocation. wine commit id 3bfc4493cb886d767e48b2677b07fef409a2db11 by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4/tests: Don't use an array of pointers in test_conf_complex_struct. An array of pointers isn't conformant on 64-bit and will overrun the destination buffer when unmarshalling. Since the purpose of this function is to test a conformant FC_BOGUS_STRUCT, use one that is conformant on both 32-bit and 64-bit. The revised test coincidentally reveals that there is a problem with the padding or alignment after a marshalled 16-bit enum, which will need to be addressed separately. Co-authored-by: Zebediah Figura <z.figura12@gmail.com> wine commit id e09c93de7bd4f27b41f572a4a79d9df190c63c6f by Alex Henrie <alexhenrie24@gmail.com> [WINESYNC] rpcrt4: Fix unexpected exception in ndr_marshal tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52909 Signed-off-by: Eric Pouech <eric.pouech@gmail.com> wine commit id c5e23886b2290304c78101d7927898700974b84a by Eric Pouech <eric.pouech@gmail.com> [WINESYNC] rpcrt4/tests: Fix the spelling of a couple of comments. wine commit id e7be6ae2f1d85c380098350cff3ed1c2fb25e5bc by Francois Gouget <fgouget@free.fr> [WINESYNC] rpcrt4: Add a refcount owned by MIDL_STUB_MESSAGE. In cases where this could have been use-after-free, exceptions were caught/hidden by RpcTryFinally, but still lead to leaks since NdrProxyFreeBuffer wasn't able to call IRPCChannelBuffer::FreeBuffer. StdProxy_GetChannel() now AddRef() on its return value (used to set __proxy_frame::_StubMsg::pRpcChannelBuffer), and NdrProxyFreeBuffer() calls the corresponding Release() and clears the now-weak pointer. This makes the behavior of these function match the observed test results, and fixes the crash/leak when a proxy is released mid-Invoke. wine commit id a7be4256f6081684e8fb0258564f9358eb36cfcf by Kevin Puetz <PuetzKevinA@JohnDeere.com> [WINESYNC] rpcrt4/tests: Add tests for lifetime of IRpcChannelBuffer. It's possible for a proxy to be released during the middle of an Invoke. E.g. a specific case where this happened was a single-shot event sink which, upon receiving the event it was waiting for, would immediately call DispEventUnadvise. This removed the proxy pointing to that sink from the connection point's list of subscribers and released the last refcount on the proxy itself. Therefore, all state used to complete an RPC call must be on the stack; once NdrProxySendReceive pumps STA messages and permits reentrancy, the proxy cannot be accessed or relied on to own anything. Add test showing MIDL_STUB_MESSAGE::pRpcChannelBuffer owns a refcount (to ensure it can read [out] parameters from the channel) wine commit id 59f39b325d2d90c09c8b346ba241dab182084c7b by Kevin Puetz <PuetzKevinA@JohnDeere.com> [WINESYNC] rpcrt4: Set the name of internal threads. wine commit id 3f0166fa89616e409e0381415e23302479100d3a by Brendan Shanks <bshanks@codeweavers.com> [KERNEL32_VISTA] Import SetThreadDescription from wine-10.0 [WINESYNC] rpcrt4: Add SEH annotations to NdrClientCall2(). wine commit id bad509227aa534f152a17316bdcf221436f03284 by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Make NdrClientCall2() SEH-compatible. wine commit id a5322fc94fa7333a09456a551d70eb1bf5a8fdbd by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Add SEH annotations to NdrClientCall3(). wine commit id 5d01faed777fadf6cb7882d8c8dc3bdfd26dd2e3 by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Make NdrClientCall3() SEH-compatible. wine commit id abe75a5f22d82d0b35d67ae9d531d49a3d67d09f by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Add SEH annotations to Ndr64AsyncClientCall(). wine commit id 37ae068773677a35342a594448d1bbabf9feb94a by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Make Ndr64AsyncClientCall() SEH-compatible. wine commit id 16713f52456d86c34eb5f0268468e044ada9d162 by Zebediah Figura <zfigura@codeweavers.com> [WINESYNC] rpcrt4: Implement I_RpcBindingInqLocalClientPID(). Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> wine commit id a0301f7db6b58cb8aedd2bd0e862f89cbdb984c5 by Zhiyi Zhang <zzhang@codeweavers.com> [KERNEL32_VISTA] Import GetNamedPipeClientProcessId from wine 10.0 [WINESYNC] rpcrt4/tests: Add I_RpcBindingInqLocalClientPID() tests. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> wine commit id 056dbb04dea4d0b990e0177f63475165f56ba8da by Zhiyi Zhang <zzhang@codeweavers.com> [WINESYNC] include: Add __WINE_DEALLOC attribute and use it for allocation functions. Signed-off-by: Brendan Shanks <bshanks@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id eb55f64d525e7e10c3ac178becd3ae7565560011 by Brendan Shanks <bshanks@codeweavers.com> [WINESYNC] include: Add __WINE_MALLOC attribute and use it for allocation functions. Signed-off-by: Brendan Shanks <bshanks@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id fd1b9afc1d4ce4f0401b15aa2a498e33ea74cc1c by Brendan Shanks <bshanks@codeweavers.com> [WINESYNC] rpcrt4: Don't cast ptrdiff_t to ULONG in traces, use %I instead. Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id ed5ade575b9035b610d1f1857c0ad5fcb1a33000 by Eric Pouech <eric.pouech@gmail.com> [WINESYNC] rpcrt4/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id c5a5143234b3fcbc3377f47cf77440c178d89517 by Eric Pouech <eric.pouech@gmail.com> [WINESYNC] rpcrt4: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id b67a843c1a25b3dcce653b14d213b904f883c009 by Eric Pouech <eric.pouech@gmail.com> [SDK] Improve GUID hack [WINESYNC] include/msvcrt: Add attribute((format)) to printf and scanf -like APIs. Fix a bunch of warnings generated by this patch and the migration of GUID.Data1 to long in ae2693e2c4079edcc719c08abed5ad58ba7aace7 Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id bb1fc33570098543e2ec8b6b43fa155adfea2182 by Eric Pouech <eric.pouech@gmail.com> [WINESYNC] rpcrt4/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4@web.de> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 0d7f7bec9d1387f916b32895fcc6dd82733245a2 by Fabian Maurer <dark.shadow4@web.de> [WINESYNC]: rpcrt4 is now in sync with wine-staging wine-7.0 [WINESYNC] rpcrt4: Fix TowerConstruct spec file entry. Signed-off-by: André Zwing <nerv@dawncrow.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 70ec0c8ccf6e5ab271dd9ce99c6ef7b4beae041e by André Zwing <nerv@dawncrow.de> [WINESYNC] rpcrt4/tests: Use the correct scanf format for a handle. Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 8e0b337df1fe64b4a0d27e9cded611faff61c29d by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 348336b8cd6fe9f62bbf0886dbc70cbc59601afa by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4/tests: Always run tests that don't require special permissions. Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 54f9b3347612cbf368e28fd53bef298819082d64 by Nikolay Sivov <nsivov@codeweavers.com> [WINESYNC] winecrt0: Determine the registration module handle directly in __wine_register_resources(). Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 1331a8ea0fd4f19b80b3fd434c5e8b2a3b6e0fd4 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] winecrt0: Add a default implementation DllRegisterServer()/DllUnregisterServer(). Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 5d82baf9747b7b133cad3be77c0cc9e24cc09582 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Avoid gai_strerror(). It's not thread-safe. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id be101103dbee37d0b382032c2a8bc1d53f333a65 by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Make inline asm compatible with Thumb-2. Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 621c06a082a5507885f2c98815f411718415a53b by Alexandre Julliard <julliard@winehq.org> [WINESYNC]: rpcrt4 is now in sync with wine-staging wine-6.0 [WINESYNC] winapi: Use __alignof__ on clang. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id fcf545f449e286118c0d1b8ee8d620a81aa22114 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] rpcrt4/tests: Avoid a printf format warning. Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id b61cfa88235d77cee4878837afd9f65d025e4a3f by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id d452c7574ffc9fef983980f09fd57c5ad04910a3 by Michael Stefaniuc <mstefani@winehq.org> [WINESYNC] rpcrt4: Fix ARM64 stack corruption in call_server_func. calls with stack_size > 16 pop argument values into x3, overwriting the number of 16-byte stack octwords. This breaks the checks for popping x4..x7 and potentially unbalances sp (based on the vaue of args[16..23]). Use a scratch register (x9) for this count so its lifetime does not conflict with preparing the parameter/result registers. Signed-off-by: Kevin Puetz <PuetzKevinA@JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id e4e7be6bd9e8a70329f5ceb4f6d66f50e3170ae2 by Kevin Puetz <PuetzKevinA@JohnDeere.com> [WINESYNC] winapi_test: Update generated.c files. Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 743ed29af51f2dfa3afbe97e94b95fe71cea0de5 by Serge Gautherie <winehq-git_serge_180711@gautherie.fr> [WINESYNC] winapi_test: Restore horizontal alignment of macro defines. Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Francois Gouget <fgouget@free.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 99c0ab2ea1f912ee699e307a77f26822dfef7b06 by Serge Gautherie <winehq-git_serge_180711@gautherie.fr> [WINESYNC] winapi_test: Remove MIDL_STUB_MESSAGE field exclusions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Francois Gouget <fgouget@free.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 151af8c04249bdd90e095c456e45ef416fcbfe97 by Serge Gautherie <winehq-git_serge_180711@gautherie.fr> [WINESYNC] rpcrt4/tests: Add some tests for marshalling embedded conformant arrays. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 59c0dbb642e788a8d28c2b653545566db6346cdb by Dmitry Timoshkov <dmitry@baikal.ru> [WINESYNC] rpcrt4/tests: Fix compilation with MS VC. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id bd995ea87100a167b021c142d63d569b336be00e by Dmitry Timoshkov <dmitry@baikal.ru> [WINESYNC] rpcrt4: Implement RpcIfInqId(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49257 Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id d3a934be367e6b7bf7ba2ad127279fa8fc930fc4 by Zhiyi Zhang <zzhang@codeweavers.com> [WINESYNC] rpcndr.h: Avoid error_status_t redefinition. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 4444d19ee37cfc20504dae2ea807458367410544 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] include: Get rid of Mac support in RPC headers. Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 7bafeef595a50d1d90dfb42371144c4f285ac5c4 by Alexandre Julliard <julliard@winehq.org> [WINESYNC] rpcrt4: Remove inexistent CreateServerInterfaceFromStub(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 98eaef3ad945eae570f92184725115613f6a3951 by Serge Gautherie <winehq-git_serge_180711@gautherie.fr> [WINESYNC] rpcrt4: Don't use GetExceptionCode outside __except block. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 7b0830c98d1af50e4a6199f83c3c412aaedccb33 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] rpcrt4: Bump the maximum accepted NDR version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45699 Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 352a64cbbcee46eae0bca6184a8dd5db2d1da5fc by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Implement Ndr64AsyncClientCall(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45699 Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 36c5adca377dada3e86a765e4ba5b2fdb000eb19 by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Implement NdrClientCall3(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45699 Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 9369aea260e144f12d95c6b6386f095a58a031db by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Handle FC_NON_ENCAPSULATED_UNION in calc_arg_size(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45699 Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id ff7f92c0b076d7801274f2423dd44ddd10f895b1 by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Fix use after free in get_iface_info. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id bfab009e67338d3f6b0142c55ec3383a5147f6a3 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] rpcrt4: Handle bare coclasses as top-level parameters. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 15e91ac2ce2d5d5f1a86a300552f921df838e792 by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Handle bare interfaces as top-level parameters. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id f4ee83c0ebf7d84ac46c9eac7f9c2eed07a32b3b by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] tests: Report all errors when failing to wait for a child process. Report the line number where the test failed to wait for the child so one can identify which child process did not behave as expected. Also wait_child_process() is meant for the general case so report all non-crash error cases as test failures so they are accounted for. Omit the "winetest_" prefix to match the other Wine test functions and so the underlying winetest_wait_child_process() function can be wrapped with the usual line-capturing macros. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48651 Signed-off-by: Francois Gouget <fgouget@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id a909baeb4e5ee8050a32832c28ff3ee79c54fbfa by Francois Gouget <fgouget@codeweavers.com> [WINESYNC] rpcrt4/tests: Remove now useless forced 0x0500 API versions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 57f08ba5259e56ae681bab1e61f86d6e8ab96f37 by Serge Gautherie <winehq-git_serge_180711@gautherie.fr> [WINESYNC] tools: Remove 0x0501 API versions forced by winapi_test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id aa384d36429110970aa72acbc5043158de6aff03 by Serge Gautherie <winehq-git_serge_180711@gautherie.fr> [WINESYNC] winecrt0: Make __wine_(un)register_resources() cdecl. This fixes a bug where 64-bit winegstreamer.dll would fail to (un)register CLSID_VideoProcessorMFT when run manually with regsvr32. Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 5c414922b4ae04a34a90afebaf5177682b6826aa by Elizabeth Figura <zfigura@codeweavers.com> [WINESYNC] guiddef.h: Remove GUID_NULL declaration. It's declared in cguid.h with proper extern "C". Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id c041605b0074e6b12e5ea1df0cc645e772a220a7 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] rpcrt4: Use MustFree for all non-base types in get_param_pointer_info. Fixes a leak for VT_VARIANT. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 1980fcafe111c5e6958bc01b121cfbd0a42a5abd by Jacek Caban <jacek@codeweavers.com> [WINESYNC] rpcrt4: Use a critical section for the context handle lock. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 76238898fc4ef41b6eb57c5e2589a7579ee6e3c6 by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Fix ITypeInfo leak in get_iface_info. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id a09c08f17a1ace1205e4c579c4f08b548258d539 by Kevin Puetz <PuetzKevinA@JohnDeere.com> [WINESYNC]: rpcrt4 is now in sync with wine-staging wine-5.0 [WINESYNC] rpcrt4/tests: Pass the default maximum call limit to RpcServerListen(). The tests intermittently crash on 2008 with RPC_S_SERVER_TOO_BUSY. I suspect this is due to the server spawned in run_server having a call limit of 20 but being expected to service 32 threads. Use the default parameter in an attempt to prevent this failure. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id c2b4d98f23f5007ad7da2083afd78ec411155a5f by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Support VT_BSTR in get_param_pointer_info. Fixes a leak in typelib marshaller. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id f64832fe6a4bb330d42f44b51cd5addb1f521291 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] rpcrt4: Fix implicit in attribute handling in write_param_fs. Fixes regression caused by typelib marshaling rewrite. Spotted by Kevin Puetz. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 1aaf870039dfb8419ae060d8c67240df1366b953 by Jacek Caban <jacek@codeweavers.com> [WINESYNC] rpcrt4: Fix ITypeInfo ref count handling. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 53efccdb6589b2fbe8370d2216d1652bf53b984b by Zebediah Figura <z.figura12@gmail.com> [WINESYNC] rpcrt4: Fix RpcNetworkIsProtseqValid[AW] spec file entries. Signed-off-by: André Hentschel <nerv@dawncrow.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 6127c688eaa68b6adcc06f44bf41cb6f0c608d77 by André Hentschel <nerv@dawncrow.de> [WINESYNC] rpcrt4/tests: Increase some timeouts. These are too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 822e2773d45544e3972c3d0e9dd60a6598d7a84f by Alexandre Julliard <julliard@winehq.org> Add rpcrt4.cfg [PSDK] Sync some rpc headers with wine-4.0 [RPCRT4] rpcrt4.spec: Add RpcExceptionFilter export [RPCRT4] Reduce diff to wine-4.18 [RPCRT4] rpcrt4.spec: ordinals -> @ +rpcsal.h WIP sync rpcndr.h with Wine Update ndr_typelib.c
6b1e81c to
f3cdde0
Compare
Addendum to commit 7f10759 (PR #8305). In `expand_pointer_table_if_necessary()`, if any of the `RefIdToPointer` `XlatTable` or `StateTable` buffers failed to be reallocated, the `realloc()` call would return NULL while the underlying buffer still be valid. Directly assigning the reallocation result to the pointers would then leak the buffers. With this fix, the `realloc()` result is stored in a temporary pointer. If the result is NULL, we free the original buffer, since the intended code behaviour is to reset all the tables. If the result is a valid pointer to the reallocated buffer, then we can use it instead.
Addendum to commit 8608467 (PR #8305). - Remove redundant `#ifndef __REACTOS__ ... #endif` inside such an already existing block. See #8305 (comment) - Move the `getenv("TEMP")` ReactOS-specific fix to a better place. - Reduce diff with respect to what we had prior to the sync. See #8305 (comment)
Addendum to commit 7f10759 (PR #8305). Addresses review comment #8305 (comment) In `expand_pointer_table_if_necessary()`, if any of the `RefIdToPointer` `XlatTable` or `StateTable` buffers failed to be reallocated, the `realloc()` call would return NULL while the underlying buffer still be valid. Directly assigning the reallocation result to the pointers would then leak the buffers. With this fix, the `realloc()` result is stored in a temporary pointer. If the result is NULL, we free the original buffer, since the intended code behaviour is to reset all the tables. If the result is a valid pointer to the reallocated buffer, then we can use it instead.
Addendum to commit 8608467 (PR #8305). - Remove redundant `#ifndef __REACTOS__ ... #endif` inside such an already existing block. See #8305 (comment) - Move the `getenv("TEMP")` ReactOS-specific fix to a better place. - Reduce diff with respect to what we had prior to the sync. See #8305 (comment)
Addendum to commit 7f10759 (PR #8305). Addresses review comment #8305 (comment) In `expand_pointer_table_if_necessary()`, if any of the `RefIdToPointer` `XlatTable` or `StateTable` buffers failed to be reallocated, the `realloc()` call would return NULL while the underlying buffer still be valid. Directly assigning the reallocation result to the pointers would then leak the buffers. With this fix, the `realloc()` result is stored in a temporary pointer. If the result is NULL, we free the original buffer, since the intended code behaviour is to reset all the tables. If the result is a valid pointer to the reallocated buffer, then we can use it instead.
Addendum to commit 7f10759 (PR #8305). Addresses review comment #8305 (comment) In `expand_pointer_table_if_necessary()`, if any of the `RefIdToPointer` `XlatTable` or `StateTable` buffers failed to be reallocated, the `realloc()` call would return NULL while the underlying buffer still be valid. Directly assigning the reallocation result to the pointers would then leak the buffers. With this fix, the `realloc()` result is stored in a temporary pointer. If the result is NULL, we free the original buffer, since the intended code behaviour is to reset all the tables. If the result is a valid pointer to the reallocated buffer, then we can use it instead.
|
thanks for the reviews! |
Addendum to commit 8608467 (PR #8305). - Remove redundant `#ifndef __REACTOS__ ... #endif` inside such an already existing block. See #8305 (comment) - Move the `getenv("TEMP")` ReactOS-specific fix to a better place. - Reduce diff with respect to what we had prior to the sync. See #8305 (comment)
Addendum to commit 7f10759 (PR #8305). Addresses review comment #8305 (comment) In `expand_pointer_table_if_necessary()`, if any of the `RefIdToPointer` `XlatTable` or `StateTable` buffers failed to be reallocated, the `realloc()` call would return NULL while the underlying buffer still be valid. Directly assigning the reallocation result to the pointers would then leak the buffers. With this fix, the `realloc()` result is stored in a temporary pointer. If the result is NULL, we free the original buffer, since the intended code behaviour is to reset all the tables. If the result is a valid pointer to the reallocated buffer, then we can use it instead.

Purpose
Update widl/wpp tools to Wine-10.0. This is needed for compiling WinRT idl files, and for various winesyncs.
JIRA issue: None
Proposed changes
Note: the wine wpp module was moved into the wrc module which is their resource compiler, which I thought was unnecessary to import, so only the relevant files are synced.
Testbot runs (Filled in by Devs)