wine-devel August 2020

wine-devel@winehq.org

78 participants
638 discussions

[PATCH] ntdll: Use an explicit memcpy instead of a struct assignment
by Martin Storsjo 14 Aug '20

14 Aug '20

Clang generates a memcpy call for this struct memcpy in any case (regardless of -fno-builtin), but the generated memcpy call uses unix calling convention instead of the windows one (despite -mabi=ms, which has no effect on x86 on clang) - while the ntdll internal memcpy implementation, which ends up called, uses windows calling conventions. By using an explicit memcpy call, we make sure to end up using the right, windows calling convention for the memcpy call. This fixes wine built for x86_64 with current Xcode 11.6. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- I've got an upcoming patch for clang, to make it respect -fno-builtin with regards of generating calls to memcpy, but if accepted, that won't be available in release versions of Xcode until earliest next year some time. --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 81263f4616..91d91fa6a5 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1009,7 +1009,7 @@ void WINAPI RtlResetRtlTranslations( const NLSTABLEINFO *info ) NlsAnsiCodePage = info->AnsiTableInfo.CodePage; NlsMbCodePageTag = info->AnsiTableInfo.DBCSCodePage; NlsMbOemCodePageTag = info->OemTableInfo.DBCSCodePage; - nls_info = *info; + memcpy( &nls_info, info, sizeof(*info) ); } -- 2.24.3 (Apple Git-128)

1 0

[PATCH] ntdll: Remove a stray duplicate instruction
by Martin Storsjo 14 Aug '20

14 Aug '20

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 928ff07cf6..0d47b9240f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1179,7 +1179,6 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "ldp x4, x5, [sp]\n\t" /* frame pointer, return address */ "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ "str x5, [x1, #0x108]\n\t" /* context->Pc */ - "str x5, [x1, #0x108]\n\t" /* context->Pc */ "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ "mov x2, #1\n\t" "bl " __ASM_NAME("NtRaiseException") "\n\t" -- 2.17.1

1 0

[PATCH] ntdll: Don't mind epilog in RtlVirtualUnwind() in case of zero op count on x64.
by Paul Gofman 14 Aug '20

14 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 5 +- dlls/ntdll/tests/exception.c | 105 ++++++++++++++++++++++++++++------- 2 files changed, 88 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0cbcc177b2e..faf24b93b58 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -815,13 +815,16 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, /* check if in prolog */ if (pc >= base + function->BeginAddress && pc < base + function->BeginAddress + info->prolog) { + TRACE("inside prolog.\n"); prolog_offset = pc - base - function->BeginAddress; } else { prolog_offset = ~0; - if (is_inside_epilog( (BYTE *)pc, base, function )) + /* Since Win10 1809 epilogue does not have a special treatment in case of zero opcode count. */ + if (info->count && is_inside_epilog( (BYTE *)pc, base, function )) { + TRACE("inside epilog.\n"); interpret_epilog( (BYTE *)pc, context, ctx_ptr ); *frame_ret = frame; return NULL; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 843c4c3ad8e..1effffd421f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1937,6 +1937,7 @@ struct unwind_test const BYTE *unwind_info; const struct results *results; unsigned int nb_results; + const struct results *broken_results; }; enum regs @@ -1961,10 +1962,11 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) CONTEXT context; RUNTIME_FUNCTION runtime_func; KNONVOLATILE_CONTEXT_POINTERS ctx_ptr; - UINT i, j, k; + UINT i, j, k, broken_k; ULONG64 fake_stack[256]; ULONG64 frame, orig_rip, orig_rbp, unset_reg; UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; + void *expected_handler, *broken_handler; memcpy( (char *)code_mem + code_offset, test->function, test->function_size ); memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); @@ -1993,23 +1995,24 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) data = (void *)0xdeadbeef; handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_rip, &runtime_func, &context, &data, &frame, &ctx_ptr ); - if (test->results[i].handler) - { - ok( (char *)handler == (char *)code_mem + 0x200, - "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); - if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); - } + + expected_handler = test->results[i].handler ? (char *)code_mem + 0x200 : NULL; + broken_handler = test->broken_results && test->broken_results[i].handler ? (char *)code_mem + 0x200 : NULL; + + ok( handler == expected_handler || broken( test->broken_results && handler == broken_handler ), + "%u/%u: wrong handler %p/%p\n", testnum, i, handler, expected_handler ); + if (handler) + ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %p\n", testnum, i, data ); else - { - ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); - } - ok( context.Rip == test->results[i].rip, "%u/%u: wrong rip %p/%x\n", - testnum, i, (void *)context.Rip, test->results[i].rip ); - ok( frame == (ULONG64)fake_stack + test->results[i].frame, "%u/%u: wrong frame %p/%p\n", - testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); + ok( context.Rip == test->results[i].rip + || broken( test->broken_results && context.Rip == test->broken_results[i].rip ), + "%u/%u: wrong rip %p/%x\n", testnum, i, (void *)context.Rip, test->results[i].rip ); + ok( frame == (ULONG64)fake_stack + test->results[i].frame + || broken( test->broken_results && frame == (ULONG64)fake_stack + test->broken_results[i].frame ), + "%u/%u: wrong frame %p/%p\n", + testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); for (j = 0; j < 16; j++) { @@ -2025,15 +2028,40 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (test->results[i].regs[k][0] == j) break; } + if (test->broken_results) + { + for (broken_k = 0; broken_k < nb_regs; broken_k++) + { + if (test->broken_results[i].regs[broken_k][0] == -1) + { + broken_k = nb_regs; + break; + } + if (test->broken_results[i].regs[broken_k][0] == j) + break; + } + } + else + { + broken_k = k; + } + if (j == rsp) /* rsp is special */ { - ULONG64 expected_rsp; + ULONG64 expected_rsp, broken_rsp; ok( !ctx_ptr.IntegerContext[j], "%u/%u: rsp should not be set in ctx_ptr\n", testnum, i ); expected_rsp = test->results[i].regs[k][1] < 0 ? -test->results[i].regs[k][1] : (ULONG64)fake_stack + test->results[i].regs[k][1]; - ok( context.Rsp == expected_rsp, + if (test->broken_results) + broken_rsp = test->broken_results[i].regs[k][1] < 0 + ? -test->broken_results[i].regs[k][1] + : (ULONG64)fake_stack + test->broken_results[i].regs[k][1]; + else + broken_rsp = expected_rsp; + + ok( context.Rsp == expected_rsp || broken( context.Rsp == broken_rsp ), "%u/%u: register rsp wrong %p/%p\n", testnum, i, (void *)context.Rsp, (void *)expected_rsp ); continue; @@ -2041,16 +2069,18 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (ctx_ptr.IntegerContext[j]) { - ok( k < nb_regs, "%u/%u: register %s should not be set to %lx\n", + ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %lx\n", testnum, i, reg_names[j], *(&context.Rax + j) ); - if (k < nb_regs) - ok( *(&context.Rax + j) == test->results[i].regs[k][1], + ok( k == nb_regs || *(&context.Rax + j) == test->results[i].regs[k][1] + || broken( broken_k == nb_regs || *(&context.Rax + j) + == test->broken_results[i].regs[broken_k][1] ), "%u/%u: register %s wrong %p/%x\n", testnum, i, reg_names[j], (void *)*(&context.Rax + j), test->results[i].regs[k][1] ); } else { - ok( k == nb_regs, "%u/%u: register %s should be set\n", testnum, i, reg_names[j] ); + ok( k == nb_regs || broken( broken_k == nb_regs ), "%u/%u: register %s should be set\n", + testnum, i, reg_names[j] ); if (j == rbp) ok( context.Rbp == orig_rbp, "%u/%u: register rbp wrong %p/unset\n", testnum, i, (void *)context.Rbp ); @@ -2217,12 +2247,45 @@ static void test_virtual_unwind(void) { 0x01, 0x50, TRUE, 0x010, 0x000, { {rsp,-0x028}, {rbp,0x000}, {-1,-1} }}, }; + static const BYTE function_4[] = + { + 0x55, /* 00: push %rbp */ + 0x5d, /* 01: pop %rbp */ + 0xc3 /* 02: ret */ + }; + + static const BYTE unwind_info_4[] = + { + 1 | (UNW_FLAG_EHANDLER << 3), /* version + flags */ + 0x0, /* prolog size */ + 0, /* opcode count */ + 0, /* frame reg */ + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ + }; + + static const struct results results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, TRUE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + }; + + static const struct results broken_results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0) }, { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) }, { function_2, sizeof(function_2), unwind_info_2, results_2, ARRAY_SIZE(results_2) }, { function_2, sizeof(function_2), unwind_info_3, results_3, ARRAY_SIZE(results_3) }, + + /* Broken before Win10 1809. */ + { function_4, sizeof(function_4), unwind_info_4, results_4, ARRAY_SIZE(results_4), broken_results_4 }, }; unsigned int i; -- 2.26.2

1 0

[PATCH] xactengine3_7: Implement IXACT3Engine PrepareWave
by Alistair Leslie-Hughes 14 Aug '20

14 Aug '20

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49689 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index c5f96decb72..7189bd27b59 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -986,8 +986,36 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave; + UINT ret; + + TRACE("(%p)->(0x%08x, %s, %d, %d, %d, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath), + wStreamingPacketSize, dwAlignment, dwPlayOffset, nLoopCount, ppWave); + + ret = FACTAudioEngine_PrepareWave(This->fact_engine, dwFlags, szWavePath, wStreamingPacketSize, + dwAlignment, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0) + { + ERR("Failed to CreateWave: %d\n", ret); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } enum { -- 2.28.0

2 1

[PATCH] ntdll: Support nested exceptions on x64.
by Paul Gofman 14 Aug '20

14 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes MS compiler test: https://github.com/microsoft/compiler-tests/blob/master/seh/seh0027.c dlls/ntdll/signal_x86_64.c | 6 ++-- dlls/ntdll/tests/exception.c | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0614b7bb58c..1fb7a14f4b2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -380,10 +380,10 @@ NTSTATUS WINAPI RtlWow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *co static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + rec->ExceptionFlags |= EH_NESTED_CALL; - /* FIXME */ - return ExceptionNestedException; + return ExceptionContinueSearch; } /********************************************************************** diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a10f4b2b82c..76f169f6c22 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -68,6 +68,10 @@ typedef struct _RTL_UNLOAD_EVENT_TRACE static RTL_UNLOAD_EVENT_TRACE *(WINAPI *pRtlGetUnloadEventTrace)(void); static void (WINAPI *pRtlGetUnloadEventTraceEx)(ULONG **element_size, ULONG **element_count, void **event_trace); +#ifndef EH_NESTED_CALL +#define EH_NESTED_CALL 0x10 +#endif + #if defined(__x86_64__) typedef struct { @@ -3809,6 +3813,65 @@ static void test_kiuserexceptiondispatcher(void) ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); } +static BOOL got_nested_exception, got_prev_frame_exception; +static void *nested_exception_initial_frame; + +static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + trace("nested_exception_handler Rip %p, Rsp %p, code %#x, flags %#x, ExceptionAddress %p.\n", + (void *)context->Rip, (void *)context->Rsp, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress); + + if (rec->ExceptionCode == 0x80000003 + && !(rec->ExceptionFlags & EH_NESTED_CALL)) + { + ok(rec->NumberParameters == 1, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + ok((void *)context->Rsp == frame, "Got unexpected frame %p.\n", frame); + ok(*(void **)frame == (char *)code_mem + 5, "Got unexpected *frame %p.\n", *(void **)frame); + ok(context->Rip == (ULONG_PTR)((char *)code_mem + 7), "Got unexpected Rip %#lx.\n", context->Rip); + + nested_exception_initial_frame = frame; + RaiseException(0xdeadbeef, 0, 0, 0); + ++context->Rip; + return ExceptionContinueExecution; + } + + if (rec->ExceptionCode == 0xdeadbeef && rec->ExceptionFlags == EH_NESTED_CALL) + { + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + got_nested_exception = TRUE; + ok(frame == nested_exception_initial_frame, "Got unexpected frame %p.\n", frame); + return ExceptionContinueSearch; + } + + ok(rec->ExceptionCode == 0xdeadbeef && !rec->ExceptionFlags, + "Got unexpected exception code %#x, flags %#x.\n", rec->ExceptionCode, rec->ExceptionFlags); + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + ok(frame == (void *)((BYTE *)nested_exception_initial_frame + 8), + "Got unexpected frame %p.\n", frame); + got_prev_frame_exception = TRUE; + return ExceptionContinueExecution; +} + +static void test_nested_exception(void) +{ + static const BYTE except_code[] = + { + 0xe8, 0x02, 0x00, 0x00, 0x00, /* call nest */ + 0x90, /* nop */ + 0xc3, /* ret */ + /* nest: */ + 0xcc, /* int3 */ + 0x90, /* nop */ + 0xc3, /* ret */ + }; + + got_nested_exception = got_prev_frame_exception = FALSE; + run_exception_test(nested_exception_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); + ok(got_nested_exception, "Did not get nested exception.\n"); + ok(got_prev_frame_exception, "Did not get nested exception in the previous frame.\n"); +} + #elif defined(__arm__) static void test_thread_context(void) @@ -5513,6 +5576,7 @@ START_TEST(exception) test_dpe_exceptions(); test_wow64_context(); test_kiuserexceptiondispatcher(); + test_nested_exception(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); -- 2.26.2

2 1

[PATCH 1/4] include: Move fundamental ORPC types to separate private header.
by Nikolay Sivov 14 Aug '20

14 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The point is to make necessary types available to rpcss idls and code, combase and ole32. dlls/ole32/dcom.idl | 151 +-------------------------------- include/Makefile.in | 1 + include/wine/orpc.idl | 189 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 150 deletions(-) create mode 100644 include/wine/orpc.idl diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index c3d090a9cb6..e00aba5834c 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -22,7 +22,7 @@ #pragma makedep proxy #pragma makedep register -import "unknwn.idl"; +#include "wine/orpc.idl" [ threading(both), @@ -30,155 +30,6 @@ import "unknwn.idl"; ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -[ - uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), - pointer_default(unique) -] -interface ObjectRpcBaseTypes -{ - typedef unsigned hyper ID; - typedef ID MID; - typedef ID OXID; - typedef ID OID; - typedef ID SETID; - typedef GUID IPID; - typedef GUID CID; - typedef REFGUID REFIPID; - - const unsigned short COM_MINOR_VERSION_1 = 1; - const unsigned short COM_MINOR_VERSION_2 = 2; - - const unsigned short COM_MAJOR_VERSION = 5; - const unsigned short COM_MINOR_VERSION = 3; - - typedef struct tagCOMVERSION { - unsigned short MajorVersion; - unsigned short MinorVersion; - } COMVERSION; - - const unsigned long ORPCF_NULL = 0; - const unsigned long ORPCF_LOCAL = 1; - const unsigned long ORPCF_RESERVED1 = 2; - const unsigned long ORPCF_RESERVED2 = 4; - const unsigned long ORPCF_RESERVED3 = 8; - const unsigned long ORPCF_RESERVED4 = 16; - - typedef struct tagORPC_EXTENT { - GUID id; - unsigned long size; - [size_is((size+7)&~7)] byte data[]; - } ORPC_EXTENT; - - typedef struct tagORPC_EXTENT_ARRAY { - unsigned long size; - unsigned long reserved; - [size_is((size+1)&~1,), unique] ORPC_EXTENT **extent; - } ORPC_EXTENT_ARRAY; - - typedef struct tagORPCTHIS { - COMVERSION version; - unsigned long flags; - unsigned long reserved1; - CID cid; - [unique] ORPC_EXTENT_ARRAY *extensions; - } ORPCTHIS; - - typedef struct tagORPCTHAT { - unsigned long flags; - [unique] ORPC_EXTENT_ARRAY *extensions; - } ORPCTHAT; - - const unsigned short NCADG_IP_UDP = 0x08; - const unsigned short NCACN_IP_TCP = 0x07; - const unsigned short NCADG_IPX = 0x0E; - const unsigned short NCACN_SPX = 0x0C; - const unsigned short NCACN_NB_NB = 0x12; - const unsigned short NCACN_NB_IPX = 0x0D; - const unsigned short NCACN_DNET_NSP = 0x04; - const unsigned short NCACN_HTTP = 0x1F; - - typedef struct tagSTRINGBINDING { - unsigned short wTowerId; - [string] WCHAR aNetworkAddr[]; - } STRINGBINDING; - - const unsigned short COM_C_AUTHZ_NONE = 0xffff; - - typedef struct tagSECURITYBINDING { - unsigned short wAuthnSvc; - unsigned short wAuthzSvc; - [string] WCHAR aPrincName[]; - } SECURITYBINDING; - - typedef struct tagDUALSTRINGARRAY { - unsigned short wNumEntries; - unsigned short wSecurityOffset; - [size_is(wNumEntries)] unsigned short aStringArray[]; - } DUALSTRINGARRAY; - - typedef struct tagOXID_INFO { - DWORD dwTid; - DWORD dwPid; - IPID ipidRemUnknown; - DWORD dwAuthnHint; - DUALSTRINGARRAY *psa; - } OXID_INFO; - - const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */ - const unsigned long OBJREF_STANDARD = 0x1; - const unsigned long OBJREF_HANDLER = 0x2; - const unsigned long OBJREF_CUSTOM = 0x4; - const unsigned long SORF_OXRES1 = 0x1; - const unsigned long SORF_OXRES2 = 0x20; - const unsigned long SORF_OXRES3 = 0x40; - const unsigned long SORF_OXRES4 = 0x80; - const unsigned long SORF_OXRES5 = 0x100; - const unsigned long SORF_OXRES6 = 0x200; - const unsigned long SORF_OXRES7 = 0x400; - const unsigned long SORF_OXRES8 = 0x800; - const unsigned long SORF_NULL = 0x0; - const unsigned long SORF_NOPING = 0x1000; - - typedef struct tagSTDOBJREF { - unsigned long flags; - unsigned long cPublicRefs; - OXID oxid; - OID oid; - IPID ipid; - } STDOBJREF; - - typedef struct tagOBJREF { - unsigned long signature; - unsigned long flags; - GUID iid; - [switch_is(flags)] union { - [case(OBJREF_STANDARD)] struct OR_STANDARD { - STDOBJREF std; - DUALSTRINGARRAY saResAddr; - } u_standard; - [case(OBJREF_HANDLER)] struct OR_HANDLER { - STDOBJREF std; - CLSID clsid; - DUALSTRINGARRAY saResAddr; - } u_handler; - [case(OBJREF_CUSTOM)] struct OR_CUSTOM { - CLSID clsid; - unsigned long cbExtension; - ULONG size; - [size_is(size), ref] byte *pData; - } u_custom; - } u_objref; - } OBJREF; - - typedef struct tagMInterfacePointer { - ULONG ulCntData; - [size_is(ulCntData)] BYTE abData[]; - } MInterfacePointer; - - typedef [unique] MInterfacePointer *PMInterfacePointer; - -} /* interface ObjectRpcBaseTypes */ - [ object, uuid(00000131-0000-0000-C000-000000000046) diff --git a/include/Makefile.in b/include/Makefile.in index 23a7d736dd5..49b174ed319 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -740,6 +740,7 @@ SOURCES = \ wine/fil_data.idl \ wine/itss.idl \ wine/library.h \ + wine/orpc.idl \ wine/svcctl.idl \ wine/winedxgi.idl \ winerror.h \ diff --git a/include/wine/orpc.idl b/include/wine/orpc.idl new file mode 100644 index 00000000000..c72a43ff2fe --- /dev/null +++ b/include/wine/orpc.idl @@ -0,0 +1,189 @@ +/* + * Copyright 2003 Ove Kåven, TransGaming Technologies + * + * 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 + */ + +import "unknwn.idl"; + +[ + uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), + pointer_default(unique) +] +interface ObjectRpcBaseTypes +{ + typedef unsigned hyper ID; + typedef ID MID; + typedef ID OXID; + typedef ID OID; + typedef ID SETID; + typedef GUID IPID; + typedef GUID CID; + typedef REFGUID REFIPID; + + const unsigned short COM_MINOR_VERSION_1 = 1; + const unsigned short COM_MINOR_VERSION_2 = 2; + + const unsigned short COM_MAJOR_VERSION = 5; + const unsigned short COM_MINOR_VERSION = 3; + + typedef struct tagCOMVERSION + { + unsigned short MajorVersion; + unsigned short MinorVersion; + } COMVERSION; + + const unsigned long ORPCF_NULL = 0; + const unsigned long ORPCF_LOCAL = 1; + const unsigned long ORPCF_RESERVED1 = 2; + const unsigned long ORPCF_RESERVED2 = 4; + const unsigned long ORPCF_RESERVED3 = 8; + const unsigned long ORPCF_RESERVED4 = 16; + + typedef struct tagORPC_EXTENT + { + GUID id; + unsigned long size; + [size_is((size + 7) & ~7)] byte data[]; + } ORPC_EXTENT; + + typedef struct tagORPC_EXTENT_ARRAY + { + unsigned long size; + unsigned long reserved; + [size_is((size + 1) & ~1,), unique] ORPC_EXTENT **extent; + } ORPC_EXTENT_ARRAY; + + typedef struct tagORPCTHIS + { + COMVERSION version; + unsigned long flags; + unsigned long reserved1; + CID cid; + [unique] ORPC_EXTENT_ARRAY *extensions; + } ORPCTHIS; + + typedef struct tagORPCTHAT + { + unsigned long flags; + [unique] ORPC_EXTENT_ARRAY *extensions; + } ORPCTHAT; + + const unsigned short NCADG_IP_UDP = 0x08; + const unsigned short NCACN_IP_TCP = 0x07; + const unsigned short NCADG_IPX = 0x0E; + const unsigned short NCACN_SPX = 0x0C; + const unsigned short NCACN_NB_NB = 0x12; + const unsigned short NCACN_NB_IPX = 0x0D; + const unsigned short NCACN_DNET_NSP = 0x04; + const unsigned short NCACN_HTTP = 0x1F; + + typedef struct tagSTRINGBINDING + { + unsigned short wTowerId; + [string] WCHAR aNetworkAddr[]; + } STRINGBINDING; + + const unsigned short COM_C_AUTHZ_NONE = 0xffff; + + typedef struct tagSECURITYBINDING + { + unsigned short wAuthnSvc; + unsigned short wAuthzSvc; + [string] WCHAR aPrincName[]; + } SECURITYBINDING; + + typedef struct tagDUALSTRINGARRAY + { + unsigned short wNumEntries; + unsigned short wSecurityOffset; + [size_is(wNumEntries)] unsigned short aStringArray[]; + } DUALSTRINGARRAY; + + typedef struct tagOXID_INFO + { + DWORD dwTid; + DWORD dwPid; + IPID ipidRemUnknown; + DWORD dwAuthnHint; + DUALSTRINGARRAY *psa; + } OXID_INFO; + + const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */ + const unsigned long OBJREF_STANDARD = 0x1; + const unsigned long OBJREF_HANDLER = 0x2; + const unsigned long OBJREF_CUSTOM = 0x4; + const unsigned long SORF_OXRES1 = 0x1; + const unsigned long SORF_OXRES2 = 0x20; + const unsigned long SORF_OXRES3 = 0x40; + const unsigned long SORF_OXRES4 = 0x80; + const unsigned long SORF_OXRES5 = 0x100; + const unsigned long SORF_OXRES6 = 0x200; + const unsigned long SORF_OXRES7 = 0x400; + const unsigned long SORF_OXRES8 = 0x800; + const unsigned long SORF_NULL = 0x0; + const unsigned long SORF_NOPING = 0x1000; + + typedef struct tagSTDOBJREF + { + unsigned long flags; + unsigned long cPublicRefs; + OXID oxid; + OID oid; + IPID ipid; + } STDOBJREF; + + typedef struct tagOBJREF + { + unsigned long signature; + unsigned long flags; + GUID iid; + [switch_is(flags)] + union + { + [case(OBJREF_STANDARD)] + struct OR_STANDARD + { + STDOBJREF std; + DUALSTRINGARRAY saResAddr; + } u_standard; + + [case(OBJREF_HANDLER)] + struct OR_HANDLER + { + STDOBJREF std; + CLSID clsid; + DUALSTRINGARRAY saResAddr; + } u_handler; + + [case(OBJREF_CUSTOM)] + struct OR_CUSTOM + { + CLSID clsid; + unsigned long cbExtension; + ULONG size; + [size_is(size), ref] byte *pData; + } u_custom; + } u_objref; + } OBJREF; + + typedef struct tagMInterfacePointer + { + ULONG ulCntData; + [size_is(ulCntData)] BYTE abData[]; + } MInterfacePointer; + + typedef [unique] MInterfacePointer *PMInterfacePointer; +} -- 2.28.0

3 9

[PATCH 2/2] windowscodecs/tests: Add tests for decoding BC1 format.
by Ziqing Hui 14 Aug '20

14 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 104 +++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)

1 0

[PATCH 8/8] kernelbase: Use PEB ConsoleHandle to check for console connection in AllocConsole.
by Jacek Caban 14 Aug '20

14 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/kernel_main.c | 1 + dlls/kernelbase/console.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-)

2 1

[PATCH 7/8] kernelbase: Move CONTROL_C_EXIT handler to kernelbase.
by Jacek Caban 14 Aug '20

14 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 31 ------------------------------- dlls/kernel32/console_private.h | 1 - dlls/kernel32/kernel_main.c | 3 --- dlls/kernelbase/console.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/main.c | 1 + 6 files changed, 21 insertions(+), 35 deletions(-)

2 1

[PATCH 6/8] kernel32: Use PEB console handle in CONSOLE_HandleCtrlC to check console connection.
by Jacek Caban 14 Aug '20

14 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

2 1

← Newer
1
...
32
33
34
35
36
37
38
...
64
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-devel August 2020