October 2020 - Wine-Commits

Nikolay Sivov : evr/mixer: Add SetOutputBounds().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 14d2b044785911ae8e0664167dce0ae40882d4cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d2b044785911ae8e066416… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:25 2020 +0300 evr/mixer: Add SetOutputBounds(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 17 +++++++++++++++-- dlls/evr/tests/evr.c | 3 +++ include/basetsd.h | 2 ++ include/mftransform.idl | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 54da3a9ce1..631cc796ea 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -79,6 +79,8 @@ struct video_mixer IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + LONGLONG lower_bound; + LONGLONG upper_bound; CRITICAL_SECTION cs; }; @@ -814,9 +816,18 @@ static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + struct video_mixer *mixer = impl_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + + EnterCriticalSection(&mixer->cs); + + mixer->lower_bound = lower; + mixer->upper_bound = upper; + + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) @@ -1879,6 +1890,8 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; object->input_count = 1; + object->lower_bound = MFT_OUTPUT_BOUND_LOWER_UNBOUNDED; + object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 175c30e818..13a07c42c5 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -531,6 +531,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_SetOutputBounds(transform, 100, 10); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/basetsd.h b/include/basetsd.h index c9f5c90e86..7087b592d1 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -265,6 +265,8 @@ typedef ULONG_PTR SIZE_T, *PSIZE_T; typedef ULONG_PTR KAFFINITY, *PKAFFINITY; +#define MINLONGLONG ((LONGLONG)~MAXLONGLONG) + /* Some Wine-specific definitions */ /* Architecture dependent settings. */ diff --git a/include/mftransform.idl b/include/mftransform.idl index 1b402a5cc7..3f4b550020 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -18,6 +18,9 @@ import "mfobjects.idl"; +cpp_quote("#define MFT_OUTPUT_BOUND_LOWER_UNBOUNDED MINLONGLONG") +cpp_quote("#define MFT_OUTPUT_BOUND_UPPER_UNBOUNDED MAXLONGLONG") + typedef [v1_enum] enum _MFT_MESSAGE_TYPE { MFT_MESSAGE_COMMAND_FLUSH = 0x00000000,

1 0

Nikolay Sivov : evr/mixer: Use regular media type interface for the output stream.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 11594f563f13cd0fa7006d56250c16fe624a6129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11594f563f13cd0fa7006d56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:27 2020 +0300 evr/mixer: Use regular media type interface for the output stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a18df5c4b3..bb76fd8894 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -47,8 +47,8 @@ struct input_stream struct output_stream { - IMFVideoMediaType *media_type; - IMFVideoMediaType **media_types; + IMFMediaType *media_type; + IMFMediaType **media_types; unsigned int type_count; }; @@ -175,11 +175,11 @@ static void video_mixer_clear_types(struct video_mixer *mixer) } for (i = 0; i < mixer->output.type_count; ++i) { - IMFVideoMediaType_Release(mixer->output.media_types[i]); + IMFMediaType_Release(mixer->output.media_types[i]); } heap_free(mixer->output.media_types); if (mixer->output.media_type) - IMFVideoMediaType_Release(mixer->output.media_type); + IMFMediaType_Release(mixer->output.media_type); mixer->output.media_type = NULL; } @@ -662,7 +662,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const for (i = 0; i < count; ++i) { subtype.Data1 = rt_formats[i]; - MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->output.media_types[i]); + MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.media_types[i]); } mixer->output.type_count = count; }

1 0

Huw Davies : riched20: Use a structure to hold the repaint range.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: efa45652a9cd8dfdab85f690b3553533b5d8caf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efa45652a9cd8dfdab85f690… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 12 13:09:05 2020 +0100 riched20: Use a structure to hold the repaint range. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a84f738e92..f864d97a0e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -903,16 +903,18 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag editor->total_rows += wc.nRow; } -static void ME_MarkRepaintEnd(ME_DisplayItem *para, - ME_DisplayItem **repaint_start, - ME_DisplayItem **repaint_end) +struct repaint_range { - if (!*repaint_start) - *repaint_start = para; - *repaint_end = para; + ME_DisplayItem *start, *end; +}; + +static void update_repaint( ME_DisplayItem *para, struct repaint_range *repaint ) +{ + if (!repaint->start) repaint->start = para; + repaint->end = para; } -static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_range *repaint ) { if (para->nFlags & MEPF_ROWSTART) { @@ -985,11 +987,11 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + update_repaint( para_get_di( para ), repaint ); cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { - ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); + update_repaint( ME_FindItemBack(cell, diParagraph), repaint ); cell = cell->member.cell.prev_cell; } } @@ -1031,7 +1033,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) struct wine_rb_entry *entry, *next_entry; ME_Context c; int totalWidth = editor->nTotalWidth, prev_width; - ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; + struct repaint_range repaint = { NULL, NULL }; if (!editor->marked_paras.root) return FALSE; @@ -1052,9 +1054,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) totalWidth = max(totalWidth, para->nWidth); if (!para->nCharOfs) - ME_MarkRepaintEnd( para->prev_para, &repaint_start, &repaint_end ); - ME_MarkRepaintEnd( para_get_di( para ), &repaint_start, &repaint_end ); - adjust_para_y( para, &c, repaint_start, repaint_end ); + update_repaint( para->prev_para, &repaint ); + update_repaint( para_get_di( para ), &repaint ); + adjust_para_y( para, &c, &repaint ); if (para->next_para) { @@ -1064,9 +1066,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { - ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + update_repaint( next->next_para, &repaint ); next->next_para->member.para.pt.y = c.pt.y; - adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + adjust_para_y( &next->next_para->member.para, &c, &repaint ); next = &next->next_para->member.para; } } @@ -1083,9 +1085,9 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); - if (repaint_start || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); - return !!repaint_start; + if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) + ME_InvalidateParagraphRange(editor, repaint.start, repaint.end); + return !!repaint.start; } void ME_InvalidateParagraphRange(ME_TextEditor *editor,

1 0

Nikolay Sivov : evr/mixer: Implement SetOutputType().
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: b8e003c0e0d9904e1279cafbaa034ad5899006e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8e003c0e0d9904e1279cafb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:28 2020 +0300 evr/mixer: Implement SetOutputType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 11 +++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index bb76fd8894..7cb35983f7 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -738,9 +738,43 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA; + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = MF_E_INVALIDMEDIATYPE; + unsigned int i, compare_flags; - return E_NOTIMPL; + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id) + return MF_E_INVALIDSTREAMNUMBER; + + EnterCriticalSection(&mixer->cs); + + for (i = 0; i < mixer->output.type_count; ++i) + { + compare_flags = 0; + if (FAILED(IMFMediaType_IsEqual(type, mixer->output.media_types[i], &compare_flags))) + continue; + + if ((compare_flags & equality_flags) == equality_flags) + { + hr = S_OK; + break; + } + } + + if (SUCCEEDED(hr) && !(flags & MFT_SET_TYPE_TEST_ONLY)) + { + if (mixer->output.media_type) + IMFMediaType_Release(mixer->output.media_type); + mixer->output.media_type = type; + IMFMediaType_AddRef(mixer->output.media_type); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 13a07c42c5..5829815988 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -958,10 +958,11 @@ todo_wine hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(transform, 1, media_type, 0); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine @@ -973,6 +974,12 @@ todo_wine if (SUCCEEDED(hr)) CoTaskMemFree(guids); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + IMFVideoProcessor_Release(processor); IMFVideoMediaType_Release(video_type);

1 0

Nikolay Sivov : evr/mixer: Use regular media type interface for input streams.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 7ab646ad482d5a127d320c7c1f16ccb72569b863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ab646ad482d5a127d320c7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:26 2020 +0300 evr/mixer: Use regular media type interface for input streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 631cc796ea..a18df5c4b3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -40,7 +40,7 @@ struct input_stream { unsigned int id; IMFAttributes *attributes; - IMFVideoMediaType *media_type; + IMFMediaType *media_type; MFVideoNormalizedRect rect; unsigned int zorder; }; @@ -170,7 +170,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) for (i = 0; i < mixer->input_count; ++i) { if (mixer->inputs[i].media_type) - IMFVideoMediaType_Release(mixer->inputs[i].media_type); + IMFMediaType_Release(mixer->inputs[i].media_type); mixer->inputs[i].media_type = NULL; } for (i = 0; i < mixer->output.type_count; ++i) @@ -714,14 +714,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - GUID subtype = { 0 }; - - if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) - WARN("Failed to get subtype %#x.\n", hr); - - if (SUCCEEDED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->inputs[0].media_type))) + if (SUCCEEDED(hr = MFCreateMediaType(&mixer->inputs[0].media_type))) hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)mixer->inputs[0].media_type); - } CoTaskMemFree(guids); }

1 0

Nikolay Sivov : mfplat/mediatype: Add IMFAudioMediaType stub.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: ad65d03013a3e49dd970bf0a3c9e4fa22c1bca2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad65d03013a3e49dd970bf0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 14:17:24 2020 +0300 mfplat/mediatype: Add IMFAudioMediaType stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 394 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 48 ++++++ 2 files changed, 442 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad65d03013a3e49dd970…

1 0

Akihiro Sagawa : documentation: Update Japanese translation.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: fef92bacc5967c1a45d7bae98af364a5df47981b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef92bacc5967c1a45d7bae9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 11 23:52:19 2020 +0900 documentation: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ja | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.ja b/documentation/README.ja index 9b44353306..57b35de991 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -19,6 +19,14 @@ READMEというファイル]を含むディレクトリ）から、以下を実 ./configure make +それから次のいずれか、Wineをインストールするか: + +make install + +または、Wineをビルドディレクトリから直接実行してください: + +./wine notepad + "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。

1 0

Zhiyi Zhang : wined3d: Clean up swapchain state on wined3d_swapchain_init() failure paths.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: 62fa286edfe1755182e2b266b17fa6d7bd46d55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=62fa286edfe1755182e2b266… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 12 16:41:01 2020 +0800 wined3d: Clean up swapchain state on wined3d_swapchain_init() failure paths. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 8 +++++--- dlls/wined3d/wined3d_main.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f821437997..aa56634f3f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,7 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_swapchain_state_unregister(&swapchain->state); + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1359,7 +1359,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr); - goto err; + wined3d_mutex_unlock(); + return hr; } swapchain->swapchain_ops = swapchain_ops; @@ -1565,6 +1566,7 @@ err: wined3d_texture_decref(swapchain->front_buffer); } + wined3d_swapchain_state_cleanup(&swapchain->state); wined3d_mutex_unlock(); return hr; @@ -2290,7 +2292,7 @@ BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_st void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { - wined3d_swapchain_state_unregister(state); + wined3d_swapchain_state_cleanup(state); heap_free(state); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 001b7dd125..7e96f87468 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -817,7 +817,7 @@ void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, wined3d_wndproc_mutex_unlock(); } -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) +static void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; @@ -850,6 +850,11 @@ void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) wined3d_wndproc_mutex_unlock(); } +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) +{ + wined3d_swapchain_state_unregister(state); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c2204cd86..901c809d87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5083,13 +5083,13 @@ struct wined3d_swapchain_state HWND device_window; }; +void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, struct wined3d *wined3d) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; -void wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops {

1 0

Michael Stefaniuc : termsv: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: c5ce35aaf89c8a78e4080f8d2eb9abd06536b6fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ce35aaf89c8a78e4080f8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:52 2020 +0200 termsv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/termsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/termsv/main.c b/programs/termsv/main.c index eb79d17f00..2ca6d0809d 100644 --- a/programs/termsv/main.c +++ b/programs/termsv/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(termsv); -static WCHAR termserviceW[] = {'T','e','r','m','S','e','r','v','i','c','e',0}; +static WCHAR termserviceW[] = L"TermService"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : plugplay: Use wide-char string literals.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: wine Branch: master Commit: d638cca0fe5bcfdca5776d71f6f254437e71fc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d638cca0fe5bcfdca5776d71… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:49 2020 +0200 plugplay: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 8e00704842..2c4054de3e 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; +static WCHAR plugplayW[] = L"PlugPlay"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0