wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Jacek Caban : conhost: Implement IOCTL_CONDRV_WRITE_OUTPUT.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 01c05387ce56ad99bd0b629a41317d7058a82462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c05387ce56ad99bd0b629a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:37 2020 +0200 conhost: Implement IOCTL_CONDRV_WRITE_OUTPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a8fd9abf28..4fbfc19a08 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -469,6 +469,82 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, return STATUS_SUCCESS; } +static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, + size_t in_size, size_t *out_size ) +{ + unsigned int i, entry_size, entry_cnt, x, y; + char_info_t *dest; + char *src; + + entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); + entry_cnt = (in_size - sizeof(*params)) / entry_size; + + TRACE( "(%u,%u) cnt %u\n", params->x, params->y, entry_cnt ); + + if (params->x >= screen_buffer->width) + { + *out_size = 0; + return STATUS_SUCCESS; + } + + for (i = 0, src = (char *)(params + 1); i < entry_cnt; i++, src += entry_size) + { + if (params->width) + { + x = params->x + i % params->width; + y = params->y + i / params->width; + if (x >= screen_buffer->width) continue; + } + else + { + x = (params->x + i) % screen_buffer->width; + y = params->y + (params->x + i) / screen_buffer->width; + } + if (y >= screen_buffer->height) break; + + dest = &screen_buffer->data[y * screen_buffer->width + x]; + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + dest->ch = *(const WCHAR *)src; + break; + case CHAR_INFO_MODE_ATTR: + dest->attr = *(const unsigned short *)src; + break; + case CHAR_INFO_MODE_TEXTATTR: + *dest = *(const char_info_t *)src; + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + dest->ch = *(const WCHAR *)src; + dest->attr = screen_buffer->attr; + break; + default: + return STATUS_INVALID_PARAMETER; + } + } + + if (*out_size == sizeof(SMALL_RECT)) + { + SMALL_RECT *region; + unsigned int width = params->width; + x = params->x; + y = params->y; + if (!(region = alloc_ioctl_buffer( sizeof(*region )))) return STATUS_NO_MEMORY; + region->Left = x; + region->Top = y; + region->Right = min( x + width, screen_buffer->width ) - 1; + region->Bottom = min( y + entry_cnt / width, screen_buffer->height ) - 1; + } + else + { + DWORD *result; + if (!(result = alloc_ioctl_buffer( sizeof(*result )))) return STATUS_NO_MEMORY; + *result = i; + } + + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -517,6 +593,12 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_WRITE_OUTPUT: + if ((*out_size != sizeof(DWORD) && *out_size != sizeof(SMALL_RECT)) || + in_size < sizeof(struct condrv_output_params)) + return STATUS_INVALID_PARAMETER; + return write_output( screen_buffer, in_data, in_size, out_size ); + case IOCTL_CONDRV_GET_OUTPUT_INFO: if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; return get_output_info( screen_buffer, out_size );

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_OUTPUT_INFO.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 151b42953b49bc0417c53656b0040ef765a8cbef URL: https://source.winehq.org/git/wine.git/?a=commit;h=151b42953b49bc0417c53656… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:24 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_OUTPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=151b42953b49bc0417c5…

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_GET_OUTPUT_INFO.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: df8578da8ef4f6e9e480e1c49cd82ebdf8281d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8578da8ef4f6e9e480e1c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:25:13 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_OUTPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7c20cd4eb3..f20d8c29ec 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -42,6 +42,16 @@ struct history_line WCHAR text[1]; }; +struct font_info +{ + short int width; + short int height; + short int weight; + short int pitch_family; + WCHAR *face_name; + size_t face_len; +}; + struct console { HANDLE server; /* console server handle */ @@ -70,6 +80,17 @@ struct screen_buffer unsigned int mode; /* output mode */ unsigned int width; /* size (w-h) of the screen buffer */ unsigned int height; + unsigned int cursor_size; /* size of cursor (percentage filled) */ + unsigned int cursor_visible;/* cursor visibility flag */ + unsigned int cursor_x; /* position of cursor */ + unsigned int cursor_y; /* position of cursor */ + unsigned short attr; /* default fill attributes (screen colors) */ + unsigned short popup_attr; /* pop-up color attributes */ + unsigned int max_width; /* size (w-h) of the window given font size */ + unsigned int max_height; + unsigned int color_map[16]; /* color table */ + RECT win; /* current visible window on the screen buffer */ + struct font_info font; /* console font information */ struct wine_rb_entry entry; /* map entry */ }; @@ -104,8 +125,27 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->console = console; screen_buffer->id = id; screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; + screen_buffer->cursor_size = 100; + screen_buffer->cursor_visible = 1; + screen_buffer->cursor_x = 0; + screen_buffer->cursor_y = 0; screen_buffer->width = width; screen_buffer->height = height; + screen_buffer->attr = 0x07; + screen_buffer->popup_attr = 0xf5; + screen_buffer->max_width = 80; + screen_buffer->max_height = 25; + screen_buffer->win.left = 0; + screen_buffer->win.right = screen_buffer->max_width - 1; + screen_buffer->win.top = 0; + screen_buffer->win.bottom = screen_buffer->max_height - 1; + screen_buffer->font.width = 0; + screen_buffer->font.height = 0; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; + screen_buffer->font.face_name = NULL; + screen_buffer->font.face_len = 0; + memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry )) { @@ -202,6 +242,38 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD return STATUS_SUCCESS; } +static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *out_size ) +{ + struct condrv_output_info *info; + + TRACE( "%p\n", screen_buffer ); + + *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len ); + if (!(info = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + + info->cursor_size = screen_buffer->cursor_size; + info->cursor_visible = screen_buffer->cursor_visible; + info->cursor_x = screen_buffer->cursor_x; + info->cursor_y = screen_buffer->cursor_y; + info->width = screen_buffer->width; + info->height = screen_buffer->height; + info->attr = screen_buffer->attr; + info->popup_attr = screen_buffer->popup_attr; + info->win_left = screen_buffer->win.left; + info->win_top = screen_buffer->win.top; + info->win_right = screen_buffer->win.right; + info->win_bottom = screen_buffer->win.bottom; + info->max_width = screen_buffer->max_width; + info->max_height = screen_buffer->max_height; + info->font_width = screen_buffer->font.width; + info->font_height = screen_buffer->font.height; + info->font_weight = screen_buffer->font.weight; + info->font_pitch_family = screen_buffer->font.pitch_family; + memcpy( info->color_map, screen_buffer->color_map, sizeof(info->color_map) ); + if (*out_size > sizeof(*info)) memcpy( info + 1, screen_buffer->font.face_name, *out_size - sizeof(*info) ); + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -250,6 +322,10 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign TRACE( "set %x mode\n", screen_buffer->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_GET_OUTPUT_INFO: + if (in_size || *out_size < sizeof(struct condrv_output_info)) return STATUS_INVALID_PARAMETER; + return get_output_info( screen_buffer, out_size ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Martin Storsjo : winedump: Fix the dumping of arm64 packed float restoration.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 7ca68a86313e39d21cc92eac84a00841318143ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca68a86313e39d21cc92eac… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 28 12:45:36 2020 +0300 winedump: Fix the dumping of arm64 packed float restoration. This previously dumped one register pair too few. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f03c523be0..fef95c6bb6 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1412,7 +1412,7 @@ static void dump_arm64_packed_info( const struct runtime_function_arm64 *func ) { if (func->u.s.RegF % 2 == 0) printf( " %04x: str d%u,[sp,#%#x]\n", pos++, 8 + func->u.s.RegF, intsz + fpsz - 8 ); - for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) + for (i = (func->u.s.RegF - 1)/ 2; i >= 0; i--) { if (!i && !intsz) printf( " %04x: stp d8,d9,[sp,-#%#x]!\n", pos++, savesz );

1 0

Jeff Smith : qcap/tests: Refactor interface testing.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 84f89605feb04c04d0ad31beb043915c269d1806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f89605feb04c04d0ad31be… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Aug 28 10:51:59 2020 -0500 qcap/tests: Refactor interface testing. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 50 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 80d4899410..326601a398 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -174,7 +174,30 @@ static void test_stream_config(IPin *pin) IAMStreamConfig_Release(stream_config); } -static void test_capture(IBaseFilter *filter) +static void test_pin_interfaces(IPin *pin) +{ + todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); + check_interface(pin, &IID_IAMStreamConfig, TRUE); + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + todo_wine check_interface(pin, &IID_IKsPin, TRUE); + check_interface(pin, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(pin, &IID_IAMCrossbar, FALSE); + check_interface(pin, &IID_IAMDroppedFrames, FALSE); + check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); + check_interface(pin, &IID_IAMPushSource, FALSE); + check_interface(pin, &IID_IAMTVTuner, FALSE); + check_interface(pin, &IID_IAMVideoCompression, FALSE); + check_interface(pin, &IID_IAMVideoProcAmp, FALSE); + check_interface(pin, &IID_IPersistPropertyBag, FALSE); + check_interface(pin, &IID_IStreamBuilder, FALSE); +} + +static void test_pins(IBaseFilter *filter) { IEnumPins *enum_pins; IPin *pin; @@ -189,32 +212,18 @@ static void test_capture(IBaseFilter *filter) IPin_QueryDirection(pin, &pin_direction); if (pin_direction == PINDIR_OUTPUT) { + test_pin_interfaces(pin); test_media_types(pin); test_stream_config(pin); - - todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); - check_interface(pin, &IID_IAMStreamConfig, TRUE); - todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); - check_interface(pin, &IID_IKsPropertySet, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); - - check_interface(pin, &IID_IAMCrossbar, FALSE); - check_interface(pin, &IID_IAMDroppedFrames, FALSE); - check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); - check_interface(pin, &IID_IAMPushSource, FALSE); - check_interface(pin, &IID_IAMTVTuner, FALSE); - check_interface(pin, &IID_IAMVideoCompression, FALSE); - check_interface(pin, &IID_IAMVideoProcAmp, FALSE); - check_interface(pin, &IID_IPersistPropertyBag, FALSE); } IPin_Release(pin); } IEnumPins_Release(enum_pins); +} +static void test_filter_interfaces(IBaseFilter *filter) +{ check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); @@ -287,7 +296,8 @@ START_TEST(videocapture) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); if (hr == S_OK) { - test_capture(filter); + test_filter_interfaces(filter); + test_pins(filter); test_misc_flags(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: f348b87bf83189bac9ea967695d06fc34c0bc02e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f348b87bf83189bac9ea9676… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Aug 28 14:28:49 2020 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 7dd56b5b30..c4ba82b064 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-08-14 13:26+0200\n" +"PO-Revision-Date: 2020-08-28 14:28+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -6809,10 +6809,8 @@ msgid "Connection reset by peer.\n" msgstr "Verbindung von Gegenstelle zurückgesetzt.\n" #: winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Nicht implementiert" +msgstr "Nicht implementiert.\n" #: winerror.mc:3760 msgid "No Signature found in file.\n"

1 0

Alistair Leslie-Hughes : include: Add more eAVEncH264VProfile enums.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 12f1ebdfeca06d7dbc8e7b99bf3c21a09a565162 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1ebdfeca06d7dbc8e7b99… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 28 18:25:27 2020 +1000 include: Add more eAVEncH264VProfile enums. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/codecapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 1d9fd7e255..9719389b08 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -30,6 +30,14 @@ enum eAVEncH264VProfile eAVEncH264VProfile_High10 = 110, eAVEncH264VProfile_444 = 244, eAVEncH264VProfile_Extended = 88, + eAVEncH264VProfile_ScalableBase = 83, + eAVEncH264VProfile_ScalableHigh = 86, + eAVEncH264VProfile_MultiviewHigh = 118, + eAVEncH264VProfile_StereoHigh = 128, + eAVEncH264VProfile_ConstrainedBase = 256, + eAVEncH264VProfile_UCConstrainedHigh = 257, + eAVEncH264VProfile_UCScalableConstrainedBase = 258, + eAVEncH264VProfile_UCScalableConstrainedHigh = 259 }; enum eAVEncH264VLevel

1 0

Nikolay Sivov : combase: Move thread data cleanup.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 2452c8c6cdf2206933b95c742f56cfb6190a579e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2452c8c6cdf2206933b95c74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:20 2020 +0300 combase: Move thread data cleanup. 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 | 33 +++++++++++++++++++++++++++++++++ dlls/ole32/compobj.c | 29 ----------------------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index da8e97df93..da91d66cc5 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -403,6 +403,36 @@ HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data) return S_OK; } +static void com_cleanup_tlsdata(void) +{ + struct tlsdata *tlsdata = NtCurrentTeb()->ReservedForOle; + struct init_spy *cursor, *cursor2; + + if (!tlsdata) + return; + + if (tlsdata->apt) + apartment_release(tlsdata->apt); + if (tlsdata->errorinfo) + IErrorInfo_Release(tlsdata->errorinfo); + if (tlsdata->state) + IUnknown_Release(tlsdata->state); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &tlsdata->spies, struct init_spy, entry) + { + list_remove(&cursor->entry); + if (cursor->spy) + IInitializeSpy_Release(cursor->spy); + heap_free(cursor); + } + + if (tlsdata->context_token) + IObjContext_Release(tlsdata->context_token); + + heap_free(tlsdata); + NtCurrentTeb()->ReservedForOle = NULL; +} + /*********************************************************************** * FreePropVariantArray (combase.@) */ @@ -2955,6 +2985,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) apartment_global_cleanup(); DeleteCriticalSection(&registered_classes_cs); break; + case DLL_THREAD_DETACH: + com_cleanup_tlsdata(); + break; } return TRUE; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 748c5c1bdf..39ccc86b35 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -489,31 +489,6 @@ HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *o return hr; } -static void COM_TlsDestroy(void) -{ - struct oletls *info = NtCurrentTeb()->ReservedForOle; - if (info) - { - struct init_spy *cursor, *cursor2; - - if (info->apt) apartment_release(info->apt); - if (info->errorinfo) IErrorInfo_Release(info->errorinfo); - if (info->state) IUnknown_Release(info->state); - - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &info->spies, struct init_spy, entry) - { - list_remove(&cursor->entry); - if (cursor->spy) IInitializeSpy_Release(cursor->spy); - heap_free(cursor); - } - - if (info->context_token) IObjContext_Release(info->context_token); - - HeapFree(GetProcessHeap(), 0, info); - NtCurrentTeb()->ReservedForOle = NULL; - } -} - /****************************************************************************** * CoBuildVersion [OLE32.@] * @@ -1324,10 +1299,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) release_std_git(); RPC_UnregisterAllChannelHooks(); break; - - case DLL_THREAD_DETACH: - COM_TlsDestroy(); - break; } return TRUE; }

1 0

Nikolay Sivov : combase: Move global apartment state cleanup.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 904f5fd0f612748799b7d74c2b490cfcefb2ba6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=904f5fd0f612748799b7d74c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:19 2020 +0300 combase: Move global apartment state cleanup. 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 | 1 + dlls/combase/combase.spec | 1 - dlls/combase/combase_private.h | 1 + dlls/ole32/compobj.c | 1 - dlls/ole32/compobj_private.h | 1 - 6 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 356935ae26..12637c8acd 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -1271,7 +1271,7 @@ HWND WINAPI apartment_getwindow(const struct apartment *apt) return apt->win; } -void WINAPI apartment_global_cleanup(void) +void apartment_global_cleanup(void) { if (apt_win_class) UnregisterClassW((const WCHAR *)MAKEINTATOM(apt_win_class), hProxyDll); diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 6d058ea6fa..da8e97df93 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2952,6 +2952,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; + apartment_global_cleanup(); DeleteCriticalSection(&registered_classes_cs); break; } diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 401979119b..a888e6deee 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -357,6 +357,5 @@ @ stdcall leave_apartment(ptr) @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) -@ stdcall apartment_global_cleanup() @ stdcall apartment_createwindowifneeded(ptr) @ stdcall apartment_findfromtid(long) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 61b7665749..e62204d289 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -105,6 +105,7 @@ static inline struct apartment* com_get_current_apt(void) HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN; +void apartment_global_cleanup(void) DECLSPEC_HIDDEN; /* RpcSs interface */ HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ef9888d9e3..748c5c1bdf 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1323,7 +1323,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) if (reserved) break; release_std_git(); RPC_UnregisterAllChannelHooks(); - apartment_global_cleanup(); break; case DLL_THREAD_DETACH: diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index e68d7b3b3d..953574423a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -248,7 +248,6 @@ extern HRESULT WINAPI enter_apartment(struct oletls *info, DWORD model) DECLSPEC void WINAPI leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; extern struct apartment * WINAPI apartment_get_current_or_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; /* DCOM messages used by the apartment window (not compatible with native) */ #define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */

1 0

Nikolay Sivov : combase: Move server class registration.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: fad7818e2865cf8ad2f2380f9094a9ac797180bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fad7818e2865cf8ad2f2380f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 28 11:05:18 2020 +0300 combase: Move server class registration. 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 | 10 +- dlls/combase/combase.c | 274 ++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 9 +- dlls/combase/combase_private.h | 9 +- dlls/combase/rpc.c | 170 +++++++++++++++++++ dlls/ole32/compobj.c | 361 ----------------------------------------- dlls/ole32/compobj_private.h | 8 - dlls/ole32/ole32.spec | 10 +- dlls/ole32/rpc.c | 179 -------------------- 9 files changed, 457 insertions(+), 573 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fad7818e2865cf8ad2f2…

1 0

← Newer
1
2
3
4
5
6
7
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020