August 2020 - Wine-commits - list.winehq.org

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_MODE.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 21c99970f3c423e2b8b1f92b2b44c5dce7cc28bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c99970f3c423e2b8b1f92b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:05:36 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_MODE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 10 ++++++++++ programs/conhost/conhost.c | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5efe4ee38c..a8c07dcae7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3971,6 +3971,16 @@ static void test_pseudo_console_child(HANDLE input, HANDLE output) ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); ok(mode == (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT), "mode = %x\n", mode); + ret = SetConsoleMode(output, mode & ~ENABLE_WRAP_AT_EOL_OUTPUT); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + + ret = GetConsoleMode(output, &mode); + ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + ok(mode == ENABLE_PROCESSED_OUTPUT, "mode = %x\n", mode); + + ret = SetConsoleMode(output, mode | ENABLE_WRAP_AT_EOL_OUTPUT); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + test_console_title(); test_WriteConsoleInputW(input); } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 06d2b15d2a..7c20cd4eb3 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -244,6 +244,12 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return STATUS_SUCCESS; } + case IOCTL_CONDRV_SET_MODE: + if (in_size != sizeof(unsigned int) || *out_size) return STATUS_INVALID_PARAMETER; + screen_buffer->mode = *(unsigned int *)in_data; + TRACE( "set %x mode\n", screen_buffer->mode ); + return STATUS_SUCCESS; + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Derek Lesho : shcore: Add GetScaleFactorForDevice() stub.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 7489efa03f09c6c3613668a0169abade6b390d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7489efa03f09c6c3613668a0… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Aug 27 16:16:36 2020 +0300 shcore: Add GetScaleFactorForDevice() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 7 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index e552ba277f..32649cccd9 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -86,6 +86,13 @@ HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *s return S_OK; } +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type) +{ + FIXME("%d\n", device_type); + + return SCALE_100_PERCENT; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d5b7a342e3..368fab1954 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -11,7 +11,7 @@ @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) @ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 82a1daaa62..4689d83e7d 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -36,8 +36,15 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum +{ + DEVICE_PRIMARY = 0, + DEVICE_IMMERSIVE = 1, +} DISPLAY_DEVICE_TYPE; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS);

1 0

Shawn M. Chapla : gdi32: Pass correct pointer to PolyDraw during EMR_POLYDRAW playback.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 84d2cf02ed2dbe19c0a67e71395d461157e17e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84d2cf02ed2dbe19c0a67e71… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Wed Aug 26 19:21:42 2020 -0400 gdi32: Pass correct pointer to PolyDraw during EMR_POLYDRAW playback. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index fc3389ff23..4d6531644b 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1622,9 +1622,12 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_POLYDRAW: { const EMRPOLYDRAW *lpPolyDraw = (const EMRPOLYDRAW *)mr; + + /* NB abTypes array doesn't start at lpPolyDraw->abTypes. It's actually + lpPolyDraw->aptl + lpPolyDraw->cptl. */ PolyDraw( hdc, (const POINT*)lpPolyDraw->aptl, - lpPolyDraw->abTypes, + (BYTE*)(lpPolyDraw->aptl + lpPolyDraw->cptl), (INT)lpPolyDraw->cptl ); break;

1 0

Shawn M. Chapla : gdi32: Implement EMR_POLYDRAW16 playback.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 4e4b1d1406f30764c1a1f4861a182f6e6b47c8f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e4b1d1406f30764c1a1f486… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Wed Aug 26 19:21:43 2020 -0400 gdi32: Implement EMR_POLYDRAW16 playback. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 4d6531644b..666828db1f 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1143,6 +1143,31 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } + case EMR_POLYDRAW16: + { + const EMRPOLYDRAW16 *pPolyDraw16 = (const EMRPOLYDRAW16 *)mr; + const POINTS *ptl = pPolyDraw16->apts; + POINT *pts = HeapAlloc(GetProcessHeap(), 0, pPolyDraw16->cpts * sizeof(POINT)); + DWORD i; + + /* NB abTypes array doesn't start at pPolyDraw16->abTypes. It's actually + pPolyDraw16->apts + pPolyDraw16->cpts. */ + const BYTE *types = (BYTE*)(pPolyDraw16->apts + pPolyDraw16->cpts); + + if (!pts) + break; + + for (i = 0; i < pPolyDraw16->cpts; ++i) + { + pts[i].x = ptl[i].x; + pts[i].y = ptl[i].y; + } + + PolyDraw(hdc, pts, types, pPolyDraw16->cpts); + HeapFree(GetProcessHeap(), 0, pts); + break; + } + case EMR_STRETCHDIBITS: { const EMRSTRETCHDIBITS *pStretchDIBits = (const EMRSTRETCHDIBITS *)mr; @@ -2243,7 +2268,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } - case EMR_POLYDRAW16: case EMR_GLSRECORD: case EMR_GLSBOUNDEDRECORD: case EMR_DRAWESCAPE:

1 0

Alexandre Julliard : ntdll: Clear the syscall frame on return instead of popping the previous one.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 75e616d52b452d37cc93f492d47eba641f9741c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75e616d52b452d37cc93f492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 11:41:36 2020 +0200 ntdll: Clear the syscall frame on return instead of popping the previous one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 23 +++++++------- dlls/ntdll/unix/signal_arm64.c | 38 ++++++++++------------- dlls/ntdll/unix/signal_i386.c | 48 +++++++++++++---------------- dlls/ntdll/unix/signal_x86_64.c | 63 +++++++++++++++++--------------------- tools/winebuild/import.c | 67 ++++++++++++++++++----------------------- 5 files changed, 105 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75e616d52b452d37cc93…

1 0

Alexandre Julliard : ntdll: Clear the thread stack by hand instead of remapping zero pages.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 3863b243fe5ef4e223a809e93a85e858952dd754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3863b243fe5ef4e223a809e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 11:58:26 2020 +0200 ntdll: Clear the thread stack by hand instead of remapping zero pages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 3 --- dlls/ntdll/signal_arm64.c | 3 --- dlls/ntdll/signal_i386.c | 17 +++++++++++------ dlls/ntdll/signal_x86_64.c | 20 ++++++++++++++------ dlls/ntdll/virtual.c | 15 --------------- 5 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 1041dadf86..0e80a35b0c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -268,10 +268,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, */ __ASM_GLOBAL_FUNC( signal_start_thread, "mov sp, r0\n\t" /* context */ - "and r0, #~0xff0\n\t" /* round down to page size */ - "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" "mov r1, #1\n\t" - "mov r0, sp\n\t" "b " __ASM_NAME("NtContinue") ) /********************************************************************** diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8d21c39f6c..40789d318c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1222,9 +1222,6 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, */ __ASM_GLOBAL_FUNC( signal_start_thread, "mov sp, x0\n\t" /* context */ - "and x0, x0, #~0xfff\n\t" /* round down to page size */ - "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" - "mov x0, sp\n\t" "mov x1, #1\n\t" "b " __ASM_NAME("NtContinue") ) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 8f7896df0d..ddc2bf6adb 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -475,13 +475,18 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, */ __ASM_GLOBAL_FUNC( signal_start_thread, "movl 4(%esp),%esi\n\t" /* context */ - "leal -12(%esi),%eax\n\t" - "movl %eax,%esp\n\t" - /* clear the stack */ - "andl $~0xfff,%eax\n\t" /* round down to page size */ - "movl %eax,(%esp)\n\t" - "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + "leal -12(%esi),%ecx\n\t" + /* clear the thread stack */ + "andl $~0xfff,%ecx\n\t" /* round down to page size */ + "movl %fs:8,%edi\n\t" /* NtCurrentTeb()->Tib.StackLimit */ + "addl $0x1000,%edi\n\t" + "movl %edi,%esp\n\t" + "subl %edi,%ecx\n\t" + "xorl %eax,%eax\n\t" + "shrl $2,%ecx\n\t" + "rep; stosl\n\t" /* switch to the initial context */ + "leal -12(%esi),%esp\n\t" "movl $1,4(%esp)\n\t" "movl %esi,(%esp)\n\t" "call " __ASM_STDCALL("NtContinue", 8) ) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 87acff3dcd..ba91cc13df 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1486,13 +1486,21 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, * signal_start_thread */ __ASM_GLOBAL_FUNC( signal_start_thread, - "movq %rcx,%rbx\n\t" /* context */ - "leaq -32(%rcx),%rcx\n\t" - "movq %rcx,%rsp\n\t" - "andq $~0xfff,%rcx\n\t" /* round down to page size */ - "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" - "movl $1,%edx\n\t" + "movq %rcx,%rbx\n\t" /* context */ + /* clear the thread stack */ + "andq $~0xfff,%rcx\n\t" /* round down to page size */ + "movq %gs:0x30,%rax\n\t" + "movq 0x10(%rax),%rdi\n\t" /* NtCurrentTeb()->Tib.StackLimit */ + "addq $0x2000,%rdi\n\t" + "movq %rdi,%rsp\n\t" + "subq %rdi,%rcx\n\t" + "xorl %eax,%eax\n\t" + "shrq $3,%rcx\n\t" + "rep; stosq\n\t" + /* switch to the initial context */ + "leaq -32(%rbx),%rsp\n\t" "movq %rbx,%rcx\n\t" + "movl $1,%edx\n\t" "call " __ASM_NAME("NtContinue") ) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index acaa6f7565..e0435181e9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -105,18 +105,3 @@ void WINAPI RtlFreeUserStack( void *stack ) NtFreeVirtualMemory( NtCurrentProcess(), &stack, &size, MEM_RELEASE ); } - - -/*********************************************************************** - * virtual_clear_thread_stack - * - * Clear the stack contents before calling the main entry point, some broken apps need that. - */ -void CDECL virtual_clear_thread_stack( void *stack_end ) -{ - void *stack = NtCurrentTeb()->Tib.StackLimit; - SIZE_T size = (char *)stack_end - (char *)stack; - - NtFreeVirtualMemory( GetCurrentProcess(), &stack, &size, MEM_DECOMMIT ); - NtAllocateVirtualMemory( GetCurrentProcess(), &stack, 0, &size, MEM_COMMIT, PAGE_READWRITE ); -}

1 0

Nikolay Sivov : ole32: Use single static instance for ROT.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 48bd5461ed0d5ba0e7c7e0c5ae5fb782764b2003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48bd5461ed0d5ba0e7c7e0c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:44 2020 +0300 ole32: Use single static instance for ROT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 10 +-- dlls/ole32/compobj_private.h | 9 +-- dlls/ole32/moniker.c | 170 ++++++++----------------------------------- dlls/ole32/ole32.spec | 1 + 4 files changed, 37 insertions(+), 153 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 55d06f197f..88482392d5 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -758,16 +758,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni * And crank-up that lock count. */ if (InterlockedExchangeAdd(&s_COMLockCount,1)==0) - { - /* - * Initialize the various COM libraries and data structures. - */ TRACE("() - Initializing the COM libraries\n"); - /* we may need to defer this until after apartment initialisation */ - RunningObjectTableImpl_Initialize(); - } - lock_init_spies(info); LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) { @@ -849,7 +841,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) TRACE("() - Releasing the COM libraries\n"); InternalRevokeAllPSClsids(); - RunningObjectTableImpl_UnInitialize(); + DestroyRunningObjectTable(); } else if (lCOMRefCnt<1) { ERR( "CoUninitialize() - not CoInitialized.\n" ); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 29e4cac362..e910746fef 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -234,12 +234,6 @@ HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDD void RPC_UnregisterAllChannelHooks(void) DECLSPEC_HIDDEN; HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; -/* This function initialize the Running Object Table */ -HRESULT WINAPI RunningObjectTableImpl_Initialize(void) DECLSPEC_HIDDEN; - -/* This function uninitialize the Running Object Table */ -HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void) DECLSPEC_HIDDEN; - /* Drag and drop */ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; @@ -365,4 +359,7 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; +extern BOOL WINAPI InternalIsInitialized(void); +extern void WINAPI DestroyRunningObjectTable(void); + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index b143b1bc6c..874b58f99e 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -63,15 +63,10 @@ struct rot_entry typedef struct RunningObjectTableImpl { IRunningObjectTable IRunningObjectTable_iface; - LONG ref; - struct list rot; /* list of ROT entries */ CRITICAL_SECTION lock; } RunningObjectTableImpl; -static RunningObjectTableImpl* runningObjectTableInstance = NULL; -static IrotHandle irot_handle; - /* define the EnumMonikerImpl structure */ typedef struct EnumMonikerImpl { @@ -256,85 +251,18 @@ RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface, return S_OK; } -/*********************************************************************** - * RunningObjectTable_AddRef - */ -static ULONG WINAPI -RunningObjectTableImpl_AddRef(IRunningObjectTable* iface) -{ - RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface); - - TRACE("(%p)\n",This); - - return InterlockedIncrement(&This->ref); -} - -/*********************************************************************** - * RunningObjectTable_Destroy - */ -static HRESULT -RunningObjectTableImpl_Destroy(void) +static ULONG WINAPI RunningObjectTableImpl_AddRef(IRunningObjectTable *iface) { - struct list *cursor, *cursor2; - IrotHandle old_handle; - - TRACE("()\n"); - - if (runningObjectTableInstance==NULL) - return E_INVALIDARG; - - /* free the ROT table memory */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &runningObjectTableInstance->rot) - { - struct rot_entry *rot_entry = LIST_ENTRY(cursor, struct rot_entry, entry); - list_remove(&rot_entry->entry); - rot_entry_delete(rot_entry); - } - - DEBUG_CLEAR_CRITSEC_NAME(&runningObjectTableInstance->lock); - DeleteCriticalSection(&runningObjectTableInstance->lock); + TRACE("%p\n", iface); - /* free the ROT structure memory */ - HeapFree(GetProcessHeap(),0,runningObjectTableInstance); - runningObjectTableInstance = NULL; - - old_handle = irot_handle; - irot_handle = NULL; - if (old_handle) - RpcBindingFree(&old_handle); - - return S_OK; + return 2; } -/*********************************************************************** - * RunningObjectTable_Release - */ -static ULONG WINAPI -RunningObjectTableImpl_Release(IRunningObjectTable* iface) +static ULONG WINAPI RunningObjectTableImpl_Release(IRunningObjectTable *iface) { - RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface); - ULONG ref; - - TRACE("(%p)\n",This); - - ref = InterlockedDecrement(&This->ref); - - /* uninitialize ROT structure if there are no more references to it */ - if (ref == 0) - { - struct list *cursor, *cursor2; - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->rot) - { - struct rot_entry *rot_entry = LIST_ENTRY(cursor, struct rot_entry, entry); - list_remove(&rot_entry->entry); - rot_entry_delete(rot_entry); - } - /* RunningObjectTable data structure will be not destroyed here ! the destruction will be done only - * when RunningObjectTableImpl_UnInitialize function is called - */ - } + TRACE("%p\n", iface); - return ref; + return 1; } /*********************************************************************** @@ -775,82 +703,48 @@ static const IRunningObjectTableVtbl VT_RunningObjectTableImpl = RunningObjectTableImpl_EnumRunning }; -/*********************************************************************** - * RunningObjectTable_Initialize - */ -HRESULT WINAPI RunningObjectTableImpl_Initialize(void) +static RunningObjectTableImpl rot = { - TRACE("\n"); - - /* create the unique instance of the RunningObjectTableImpl structure */ - runningObjectTableInstance = HeapAlloc(GetProcessHeap(), 0, sizeof(RunningObjectTableImpl)); - - if (!runningObjectTableInstance) - return E_OUTOFMEMORY; - - /* initialize the virtual table function */ - runningObjectTableInstance->IRunningObjectTable_iface.lpVtbl = &VT_RunningObjectTableImpl; - - /* the initial reference is set to "1" so that it isn't destroyed after its - * first use until the process is destroyed, as the running object table is - * a process-wide cache of a global table */ - runningObjectTableInstance->ref = 1; - - list_init(&runningObjectTableInstance->rot); - InitializeCriticalSection(&runningObjectTableInstance->lock); - DEBUG_SET_CRITSEC_NAME(&runningObjectTableInstance->lock, "RunningObjectTableImpl.lock"); - - return S_OK; -} + .IRunningObjectTable_iface.lpVtbl = &VT_RunningObjectTableImpl, + .lock.LockCount = -1, + .rot = LIST_INIT(rot.rot), +}; /*********************************************************************** - * RunningObjectTable_UnInitialize + * GetRunningObjectTable (OLE32.@) */ -HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void) +HRESULT WINAPI GetRunningObjectTable(DWORD reserved, IRunningObjectTable **ret) { - TRACE("\n"); + TRACE("%#x, %p\n", reserved, ret); - if (runningObjectTableInstance==NULL) - return E_POINTER; + if (reserved!=0) + return E_UNEXPECTED; - RunningObjectTableImpl_Release(&runningObjectTableInstance->IRunningObjectTable_iface); + if (!InternalIsInitialized()) + return CO_E_NOTINITIALIZED; - RunningObjectTableImpl_Destroy(); + *ret = &rot.IRunningObjectTable_iface; + IRunningObjectTable_AddRef(*ret); return S_OK; } /*********************************************************************** - * GetRunningObjectTable (OLE32.@) - * - * Retrieves the global running object table. - * - * PARAMS - * reserved [I] Reserved. Set to 0. - * pprot [O] Address that receives the pointer to the running object table. - * - * RETURNS - * Success: S_OK. - * Failure: Any HRESULT code. - */ -HRESULT WINAPI -GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) + * DestroyRunningObjectTable (ole32.@) +*/ +void WINAPI DestroyRunningObjectTable(void) { - IID riid=IID_IRunningObjectTable; - HRESULT res; - - TRACE("()\n"); - - if (reserved!=0) - return E_UNEXPECTED; - - if(runningObjectTableInstance==NULL) - return CO_E_NOTINITIALIZED; + struct rot_entry *rot_entry, *cursor2; - res = IRunningObjectTable_QueryInterface(&runningObjectTableInstance->IRunningObjectTable_iface, - &riid,(void**)pprot); + TRACE("\n"); - return res; + EnterCriticalSection(&rot.lock); + LIST_FOR_EACH_ENTRY_SAFE(rot_entry, cursor2, &rot.rot, struct rot_entry, entry) + { + list_remove(&rot_entry->entry); + rot_entry_delete(rot_entry); + } + LeaveCriticalSection(&rot.lock); } static HRESULT get_moniker_for_progid_display_name(LPBC pbc, diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 4908729d1f..c102bce177 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -106,6 +106,7 @@ @ stdcall CreateOleAdviseHolder(ptr) @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) +@ stdcall DestroyRunningObjectTable() @ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall -private DllGetClassObject (ptr ptr ptr) @ stub DllGetClassObjectWOW

1 0

Nikolay Sivov : combase: Move initialisation functions.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: ee080a423aef9a8ead3348e286bcaf4ec8dc8db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee080a423aef9a8ead3348e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:45 2020 +0300 combase: Move initialisation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 136 ++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 5 +- dlls/combase/combase_private.h | 3 + dlls/ole32/compobj.c | 179 ----------------------------------------- dlls/ole32/ole32.spec | 4 +- 5 files changed, 142 insertions(+), 185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee080a423aef9a8ead33…

1 0

Nikolay Sivov : combase: Move MTA usage functions.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 66d912a7b59df690fe258e69075310b77d55117c URL: https://source.winehq.org/git/wine.git/?a=commit;h=66d912a7b59df690fe258e69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:46 2020 +0300 combase: Move MTA usage functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 4 ++-- dlls/combase/combase.c | 21 +++++++++++++++++++++ dlls/combase/combase.spec | 6 ++---- dlls/combase/combase_private.h | 2 ++ dlls/ole32/compobj.c | 21 --------------------- dlls/ole32/compobj_private.h | 2 -- dlls/ole32/ole32.spec | 4 ++-- 7 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 81071563c0..1ce7021bef 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -1187,7 +1187,7 @@ struct mta_cookie struct list entry; }; -HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) +HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) { struct mta_cookie *mta_cookie; @@ -1211,7 +1211,7 @@ HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) return S_OK; } -void WINAPI apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) +void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) { struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index cddc9e2306..7d61faefa9 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2401,6 +2401,27 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) unlock_init_spies(tlsdata); } +/*********************************************************************** + * CoIncrementMTAUsage (combase.@) + */ +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) +{ + TRACE("%p\n", cookie); + + return apartment_increment_mta_usage(cookie); +} + +/*********************************************************************** + * CoDecrementMTAUsage (combase.@) + */ +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) +{ + TRACE("%p\n", cookie); + + apartment_decrement_mta_usage(cookie); + return S_OK; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 01377c8045..52c4ef51b2 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -86,7 +86,7 @@ @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy -@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -122,7 +122,7 @@ @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() -@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW @@ -357,8 +357,6 @@ @ stdcall leave_apartment(ptr) @ stdcall apartment_get_inproc_class_object(ptr ptr ptr ptr long ptr) @ stdcall apartment_get_mta() -@ stdcall apartment_decrement_mta_usage(ptr) -@ stdcall apartment_increment_mta_usage(ptr) @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) @ stdcall apartment_global_cleanup() diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 122522baad..32ffba0df8 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -133,6 +133,8 @@ struct stub_manager HRESULT WINAPI enter_apartment(struct tlsdata *data, DWORD model); void WINAPI leave_apartment(struct tlsdata *data); +HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; +void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; /* Stub Manager */ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5afacf3ee3..5adcd94b2c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1809,27 +1809,6 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } -/*********************************************************************** - * CoIncrementMTAUsage [OLE32.@] - */ -HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) -{ - TRACE("%p\n", cookie); - - return apartment_increment_mta_usage(cookie); -} - -/*********************************************************************** - * CoDecrementMTAUsage [OLE32.@] - */ -HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) -{ - TRACE("%p\n", cookie); - - apartment_decrement_mta_usage(cookie); - return S_OK; -} - /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index e910746fef..2c8c337c64 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -257,8 +257,6 @@ struct class_reg_data; extern HRESULT WINAPI apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv) DECLSPEC_HIDDEN; -extern void WINAPI apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; -extern HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; extern struct apartment * WINAPI apartment_get_mta(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; extern void WINAPI apartment_global_cleanup(void) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e80cafd366..7d3d1e2e6e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,7 +14,7 @@ @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx -@ stdcall CoDecrementMTAUsage(ptr) +@ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @@ -48,7 +48,7 @@ @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) combase.CoGetTreatAsClass @ stdcall CoImpersonateClient() combase.CoImpersonateClient -@ stdcall CoIncrementMTAUsage(ptr) +@ stdcall CoIncrementMTAUsage(ptr) combase.CoIncrementMTAUsage @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) combase.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) combase.CoInitializeSecurity

1 0

Nikolay Sivov : combase: Move CoGetApartmentType().
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 373c753e996d0c38e56d4ca5f0d7f4c5f1ae9ca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=373c753e996d0c38e56d4ca5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:47 2020 +0300 combase: Move CoGetApartmentType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 2 +- dlls/combase/combase.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 3 +-- dlls/combase/combase_private.h | 2 ++ dlls/ole32/compobj.c | 38 -------------------------------------- dlls/ole32/compobj_private.h | 1 - dlls/ole32/ole32.spec | 2 +- 7 files changed, 44 insertions(+), 43 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 1ce7021bef..2d1f7a7574 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -627,7 +627,7 @@ static struct apartment *apartment_get_or_create(DWORD model) return apt; } -struct apartment * WINAPI apartment_get_mta(void) +struct apartment * apartment_get_mta(void) { struct apartment *apt; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7d61faefa9..47e31ebad1 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2422,6 +2422,45 @@ HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) return S_OK; } +/*********************************************************************** + * CoGetApartmentType (combase.@) + */ +HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) +{ + struct tlsdata *tlsdata; + struct apartment *apt; + HRESULT hr; + + TRACE("%p, %p\n", type, qualifier); + + if (!type || !qualifier) + return E_INVALIDARG; + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (!tlsdata->apt) + *type = APTTYPE_CURRENT; + else if (tlsdata->apt->multi_threaded) + *type = APTTYPE_MTA; + else if (tlsdata->apt->main) + *type = APTTYPE_MAINSTA; + else + *type = APTTYPE_STA; + + *qualifier = APTTYPEQUALIFIER_NONE; + + if (!tlsdata->apt && (apt = apartment_get_mta())) + { + apartment_release(apt); + *type = APTTYPE_MTA; + *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; + return S_OK; + } + + return tlsdata->apt ? S_OK : CO_E_NOTINITIALIZED; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 52c4ef51b2..143de28d7d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -96,7 +96,7 @@ @ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID -@ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType +@ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallState(long ptr) @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @@ -356,7 +356,6 @@ @ stdcall enter_apartment(ptr long) @ stdcall leave_apartment(ptr) @ stdcall apartment_get_inproc_class_object(ptr ptr ptr ptr long ptr) -@ stdcall apartment_get_mta() @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) @ stdcall apartment_global_cleanup() diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 32ffba0df8..1f80f1a12b 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -133,8 +133,10 @@ struct stub_manager HRESULT WINAPI enter_apartment(struct tlsdata *data, DWORD model); void WINAPI leave_apartment(struct tlsdata *data); +void WINAPI apartment_release(struct apartment *apt); HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; +struct apartment * apartment_get_mta(void) DECLSPEC_HIDDEN; /* Stub Manager */ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5adcd94b2c..975af46f85 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1771,44 +1771,6 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * CoGetApartmentType [OLE32.@] - */ -HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) -{ - struct oletls *info = COM_CurrentInfo(); - struct apartment *apt; - - TRACE("(%p, %p)\n", type, qualifier); - - if (!type || !qualifier) - return E_INVALIDARG; - - if (!info) - return E_OUTOFMEMORY; - - if (!info->apt) - *type = APTTYPE_CURRENT; - else if (info->apt->multi_threaded) - *type = APTTYPE_MTA; - else if (info->apt->main) - *type = APTTYPE_MAINSTA; - else - *type = APTTYPE_STA; - - *qualifier = APTTYPEQUALIFIER_NONE; - - if (!info->apt && (apt = apartment_get_mta())) - { - apartment_release(apt); - *type = APTTYPE_MTA; - *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; - return S_OK; - } - - return info->apt ? S_OK : CO_E_NOTINITIALIZED; -} - /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 2c8c337c64..9d6a1d1b79 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -257,7 +257,6 @@ struct class_reg_data; extern HRESULT WINAPI apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv) DECLSPEC_HIDDEN; -extern struct apartment * WINAPI apartment_get_mta(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; extern void WINAPI apartment_global_cleanup(void) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7d3d1e2e6e..0b38e74388 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -26,7 +26,7 @@ @ stdcall CoFreeUnusedLibraries() combase.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) combase.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState -@ stdcall CoGetApartmentType(ptr ptr) +@ stdcall CoGetApartmentType(ptr ptr) combase.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) combase.CoGetCallContext @ stdcall CoGetCallState(long ptr) combase.CoGetCallState @ stdcall CoGetCallerTID(ptr)

1 0