October 2020 - Wine-Commits

Jacek Caban : conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 01c17ca26027d055c5e983c8d76d60647bf7f24d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c17ca26027d055c5e983c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:59 2020 +0200 conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 3 +-- programs/conhost/conhost.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 345241a44fd..2b3c6c3315a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1373,8 +1373,7 @@ BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length */ BOOL WINAPI ReadConsoleInputW( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) { - int blocking = 1; - if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), + if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, NULL, 0, buffer, length * sizeof(*buffer), count )) return FALSE; *count /= sizeof(*buffer); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8fb28e18ba9..3b4255ea310 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2358,11 +2358,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_INPUT: { - unsigned int blocking; - if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; + if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - blocking = in_size && *(unsigned int *)in_data; - if (blocking && !console->record_count && *out_size) + if (!console->record_count && *out_size) { TRACE( "pending read\n" ); console->read_ioctl = IOCTL_CONDRV_READ_INPUT;

1 0

Austin English : qedit: Add a version resource.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: c130054120cffe595e21f43d5e7d2202f23c91a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130054120cffe595e21f43d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:36:22 2020 -0500 qedit: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 2 ++ dlls/qedit/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 4891328c7a9..4eb57322f5e 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ timeline.c IDL_SRCS = qedit_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qedit/version.rc b/dlls/qedit/version.rc new file mode 100644 index 00000000000..dd5f3ccbc7f --- /dev/null +++ b/dlls/qedit/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qedit" +#define WINE_FILENAME_STR "qedit.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : kernel32: Move FlushConsoleInputBuffer to kernelbase.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: ea8fa3174cba57df1120438724ddb8d41442c2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8fa3174cba57df11204387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:49 2020 +0200 kernel32: Move FlushConsoleInputBuffer to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 9 --------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f9d24f5c885..4b74c1183ca 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -148,15 +148,6 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) } -/*********************************************************************** - * FlushConsoleInputBuffer (KERNEL32.@) - */ -BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) -{ - return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL ); -} - - /*********************************************************************** * SetConsoleTitleA (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 08a64955123..79964c7a9b3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -517,7 +517,7 @@ @ stdcall -import FlsFree(long) @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) +@ stdcall -import FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d073b77eaa3..345241a44fd 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1704,6 +1704,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer, } +/*********************************************************************** + * FlushConsoleInputBuffer (kernelbase.@) + */ +BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) +{ + return console_ioctl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL ); +} + + /*********************************************************************** * Beep (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e55194f2041..9c7babde7fd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -381,7 +381,7 @@ @ stdcall FlsFree(long) @ stdcall FlsGetValue(long) @ stdcall FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer +@ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers

1 0

Damjan Jovanovic : riched20: Implement ITextRange/ITextSelection Copy and Cut.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: aa1ef09fefafd785b21bfe458da45df0521c0057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa1ef09fefafd785b21bfe45… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 15 10:39:42 2020 +0100 riched20: Implement ITextRange/ITextSelection Copy and Cut. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 84 ++++++++++++++++++++++++++----------------- dlls/riched20/editor.h | 2 ++ dlls/riched20/richole.c | 51 +++++++++++++++++++++----- dlls/riched20/tests/richole.c | 74 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa1ef09fefafd785b21b…

1 0

Huw Davies : riched20: Simplify the char offset from run offset function.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 120ee0de1b1d947e96ec3b5290b5f5212f9c4cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=120ee0de1b1d947e96ec3b52… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:39 2020 +0100 riched20: Simplify the char offset from run offset function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 13 +++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 30441658311..d9bcea84f74 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4322,15 +4322,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } cursor_from_char_ofs( editor, wParam, &cursor ); item = ME_RowStart( cursor.pRun ); - nThisLineOfs = ME_CharOfsFromRunOfs( editor, cursor.pPara, ME_FindItemFwd( item, diRun ), 0 ); + nThisLineOfs = run_char_ofs( &ME_FindItemFwd( item, diRun )->member.run, 0 ); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); if (item_end->type == diStartRow) - nNextLineOfs = ME_CharOfsFromRunOfs(editor, cursor.pPara, ME_FindItemFwd( item_end, diRun ), 0); + nNextLineOfs = run_char_ofs( &ME_FindItemFwd( item_end, diRun )->member.run, 0 ); else { ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.len; + nNextLineOfs = run_char_ofs( &endRun->member.run, 0 ); } nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 163be9c8179..0503a671ea1 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,6 +120,7 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; +int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; @@ -140,7 +141,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 92d0721247c..22a5db8610b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -187,18 +187,15 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) } /****************************************************************************** - * ME_CharOfsFromRunOfs + * run_char_ofs * - * Converts a character position relative to the start of the run, to a + * Converts a character position relative to the start of the run to a * character position relative to the start of the document. - * Kind of a "local to global" offset conversion. */ -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, - const ME_DisplayItem *pRun, int nOfs) + +int run_char_ofs( ME_Run *run, int ofs ) { - assert(pRun && pRun->type == diRun); - assert(pPara && pPara->type == diParagraph); - return pPara->member.para.nCharOfs + pRun->member.run.nCharOfs + nOfs; + return run->para->nCharOfs + run->nCharOfs + ofs; } /******************************************************************************

1 0

Nikolay Sivov : evr/tests: Add a mixer tests for clearing output in idle state.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: d91a82ac8db314ff8c04544bf0402434e218b8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91a82ac8db314ff8c04544b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:55 2020 +0300 evr/tests: Add a mixer tests for clearing output in idle state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d0e39cb47c9..9124109c07f 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1994,16 +1994,82 @@ static void test_mixer_zorder(void) IMFTransform_Release(mixer); } +static IDirect3DSurface9 * create_surface(IDirect3DDeviceManager9 *manager, unsigned int width, + unsigned int height) +{ + IDirectXVideoAccelerationService *service; + IDirect3DSurface9 *surface = NULL; + IDirect3DDevice9 *device; + HANDLE handle; + HRESULT hr; + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(service, width, height, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirectXVideoAccelerationService_Release(service); + + hr = IDirect3DDevice9_ColorFill(device, surface, NULL, D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return surface; +} + +/* Format is assumed as 32bpp */ +static DWORD get_surface_color(IDirect3DSurface9 *surface, unsigned int x, unsigned int y) +{ + D3DLOCKED_RECT locked_rect = { 0 }; + D3DSURFACE_DESC desc; + DWORD *row, color; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(x < desc.Width && y < desc.Height, "Invalid coordinate.\n"); + if (x >= desc.Width || y >= desc.Height) return 0; + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + row = (DWORD *)((char *)locked_rect.pBits + y * locked_rect.Pitch); + color = row[x]; + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return color; +} + static void test_mixer_samples(void) { IDirect3DDeviceManager9 *manager; MFT_OUTPUT_DATA_BUFFER buffer; + IDirect3DSurface9 *surface; + IMFDesiredSample *desired; IDirect3DDevice9 *device; IMFMediaType *video_type; + DWORD color, status; IMFTransform *mixer; IMFSample *sample; IDirect3D9 *d3d; - DWORD status; HWND window; UINT token; HRESULT hr; @@ -2030,8 +2096,6 @@ static void test_mixer_samples(void) hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IDirect3DDeviceManager9_Release(manager); - video_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); @@ -2052,6 +2116,7 @@ static void test_mixer_samples(void) todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* It needs a sample with a backing surface. */ hr = MFCreateSample(&sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2062,9 +2127,41 @@ todo_wine IMFSample_Release(sample); + surface = create_surface(manager, 64, 64); + + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + buffer.pSample = sample; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); +todo_wine + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); + ok(color == D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00), "Unexpected color %#x.\n", color); + + /* Streaming is not started yet. Output is colored black, but only if desired timestamps were set. */ + IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired, 100, 0); + + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); +todo_wine + ok(!color, "Unexpected color %#x.\n", color); + + IMFSample_Release(sample); + + IDirect3DSurface9_Release(surface); + IMFTransform_Release(mixer); IDirect3DDevice9_Release(device); + IDirect3DDeviceManager9_Release(manager); done: IDirect3D9_Release(d3d);

1 0

Jacek Caban : kernelbase: Move console code page validation to conhost.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 1d8c2d28cb2ec313d1b5c1f762624be776a3dca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8c2d28cb2ec313d1b5c1f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:20:09 2020 +0200 kernelbase: Move console code page validation to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 ++-------------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 2b3c6c3315a..d387b49c534 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -637,7 +637,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return 0; - return info.input_cp ? info.input_cp : GetOEMCP(); + return info.input_cp; } @@ -710,7 +710,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return 0; - return info.output_cp ? info.output_cp : GetOEMCP(); + return info.output_cp; } @@ -1092,12 +1092,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCP( UINT cp ) { struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE }; - if (!IsValidCodePage( cp )) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - params.info.input_cp = cp; return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); @@ -1237,12 +1231,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) { struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE }; - if (!IsValidCodePage( cp )) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - params.info.output_cp = cp; return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3b4255ea310..6985a9ca0b0 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2407,9 +2407,15 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set info\n" ); if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + if (!IsValidCodePage( params->info.input_cp )) return STATUS_INVALID_PARAMETER; console->input_cp = params->info.input_cp; + } if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + if (!IsValidCodePage( params->info.output_cp )) return STATUS_INVALID_PARAMETER; console->output_cp = params->info.output_cp; + } return STATUS_SUCCESS; }

1 0

Nikolay Sivov : mf/evr: Add attributes store for the sink.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: f0c2b0d2fcd20490d806357f3c14083717552f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c2b0d2fcd20490d806357f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:53 2020 +0300 mf/evr: Add attributes store for the sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 353 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 12 ++ 2 files changed, 365 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0c2b0d2fcd20490d806…

1 0

Alistair Leslie-Hughes : sapi: Return a default token in ISpVoice::GetVoice
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 6eaa2d2df2a17a8b24d46e1224abd9df5b07d9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eaa2d2df2a17a8b24d46e12… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 15 20:39:55 2020 +1100 sapi: Return a default token in ISpVoice::GetVoice GetVoice returns a default voice when one is not active. This stops a crash on startup with Scrivener. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 584c3d56b70..77e54e079ac 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -561,7 +561,7 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) { FIXME("(%p, %p): stub.\n", iface, token); - return E_NOTIMPL; + return token_create(NULL, &IID_ISpObjectToken, (void **)token); } static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number)

1 0

Huw Davies : riched20: Remove InternalInsertTextFromCursor().
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: fe0a7a78db232f1d8cac35732eca86e0ee895b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0a7a78db232f1d8cac3573… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:40 2020 +0100 riched20: Remove InternalInsertTextFromCursor(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 110 ++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 61 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d66dd57383b..4764dec8f33 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -460,20 +460,6 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) nChars, FALSE); } -static ME_DisplayItem * -ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style, - int flags) -{ - ME_Cursor *p = &editor->pCursors[nCursor]; - - editor->bCaretAtEnd = FALSE; - - assert(p->pRun->type == diRun); - - return run_get_di( run_insert( editor, p, style, str, len, flags ) ); -} - static struct re_object* create_re_object(const REOBJECT *reo) { struct re_object *reobj = heap_alloc(sizeof(*reobj)); @@ -489,96 +475,98 @@ static struct re_object* create_re_object(const REOBJECT *reo) void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - ME_DisplayItem *di; - WCHAR space = ' '; - ME_DisplayItem *di_prev = NULL; - struct re_object *reobj_prev = NULL; - + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + ME_Run *run, *prev; + const WCHAR space = ' '; + struct re_object *reobj_prev = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; + /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_GRAPHICS); - di->member.run.reobj = create_re_object(reo); + run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); + editor->bCaretAtEnd = FALSE; + + run->reobj = create_re_object( reo ); - di_prev = di; - while (ME_PrevRun(NULL, &di_prev, TRUE)) + prev = run; + while ((prev = run_prev_all_paras( prev ))) { - if (di_prev->member.run.reobj) + if (prev->reobj) { - reobj_prev = di_prev->member.run.reobj; + reobj_prev = prev->reobj; break; } } if (reobj_prev) - list_add_after(&reobj_prev->entry, &di->member.run.reobj->entry); + list_add_after(&reobj_prev->entry, &run->reobj->entry); else - list_add_head(&editor->reobj_list, &di->member.run.reobj->entry); + list_add_head(&editor->reobj_list, &run->reobj->entry); - ME_ReleaseStyle(pStyle); + ME_ReleaseStyle( style ); } void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - WCHAR space = ' '; + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + const WCHAR space = ' '; + ME_Cursor *cursor = editor->pCursors + nCursor; /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_ENDROW); - ME_ReleaseStyle(pStyle); + run_insert( editor, cursor, style, &space, 1, MERF_ENDROW ); + editor->bCaretAtEnd = FALSE; + + ME_ReleaseStyle( style ); } void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style) + const WCHAR *str, int len, ME_Style *style) { const WCHAR *pos; - ME_Cursor *p = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; int oldLen; /* FIXME really HERE ? */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - /* FIXME: is this too slow? */ - /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ oldLen = ME_GetTextLength(editor); /* text operations set modified state */ editor->nModifyStep = 1; + editor->bCaretAtEnd = FALSE; assert(style); - assert(nCursor>=0 && nCursor<editor->nCursors); - if (len == -1) - len = lstrlenW(str); + if (len == -1) len = lstrlenW( str ); /* grow the text limit to fit our text */ - if(editor->nTextLimit < oldLen +len) - editor->nTextLimit = oldLen + len; + if (editor->nTextLimit < oldLen + len) editor->nTextLimit = oldLen + len; pos = str; while (len) { /* FIXME this sucks - no respect for unicode (what else can be a line separator in unicode?) */ - while(pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') + while (pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') pos++; - if (pos != str) { /* handle text */ - ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); - } else if (*pos == '\t') { /* handle tabs */ - WCHAR tab = '\t'; - ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); + if (pos != str) /* handle text */ + run_insert( editor, cursor, style, str, pos - str, 0 ); + else if (*pos == '\t') /* handle tabs */ + { + const WCHAR tab = '\t'; + run_insert( editor, cursor, style, &tab, 1, MERF_TAB ); pos++; - } else { /* handle EOLs */ + } + else /* handle EOLs */ + { ME_Run *end_run, *run, *prev; ME_Paragraph *new_para; int eol_len = 0; @@ -596,7 +584,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 3; else eol_len = 1; - } else { + } + else + { assert(*pos == '\n'); eol_len = 1; } @@ -605,8 +595,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if (!editor->bEmulateVersion10 && eol_len == 3) { /* handle special \r\r\n sequence (richedit 2.x and higher only) */ - WCHAR space = ' '; - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); + const WCHAR space = ' '; + run_insert( editor, cursor, style, &space, 1, 0 ); } else { @@ -618,17 +608,15 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 1; } - p = &editor->pCursors[nCursor]; - - if (p->nOffset == p->pRun->member.run.len) + if (cursor->nOffset == cursor->pRun->member.run.len) { - run = run_next( &p->pRun->member.run ); - if (!run) run = &p->pRun->member.run; + run = run_next( &cursor->pRun->member.run ); + if (!run) run = &cursor->pRun->member.run; } else { - if (p->nOffset) run_split( editor, p ); - run = &p->pRun->member.run; + if (cursor->nOffset) run_split( editor, cursor ); + run = &cursor->pRun->member.run; } new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para;

1 0

Austin English : qasf: Add a version resource.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 1737a7878f034534fb8eb908e6940cffe55494b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1737a7878f034534fb8eb908… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:38:41 2020 -0500 qasf: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 2 ++ dlls/qasf/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index 39239d38aea..928bf04d80e 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -10,3 +10,5 @@ C_SRCS = \ IDL_SRCS = \ qasf_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qasf/version.rc b/dlls/qasf/version.rc new file mode 100644 index 00000000000..dab46194395 --- /dev/null +++ b/dlls/qasf/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qasf" +#define WINE_FILENAME_STR "qasf.dll" +#define WINE_FILEVERSION 9,0,0,4503 +#define WINE_FILEVERSION_STR "9.0.0.4503" +#define WINE_PRODUCTVERSION 9,0,0,4503 +#define WINE_PRODUCTVERSION_STR "9.0.0.4503" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dsdmo: Add a version resource.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 8a70e7eba178614ccaa992bf5551d5986dd0d953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a70e7eba178614ccaa992bf… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:39:27 2020 -0500 dsdmo: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 2 ++ dlls/dsdmo/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index d184b025ad0..d86dbbd804a 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ IDL_SRCS = \ dsdmo.idl + +RC_SRCS = version.rc diff --git a/dlls/dsdmo/version.rc b/dlls/dsdmo/version.rc new file mode 100644 index 00000000000..77cc1728fbf --- /dev/null +++ b/dlls/dsdmo/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dsdmo" +#define WINE_FILENAME_STR "dsdmo.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : kernel32: Import FlushFileBuffers from kernelbase.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 7fe55d2f7a66d60f3bf4890f59311920f1cc3608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fe55d2f7a66d60f3bf4890f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:53 2020 +0200 kernel32: Import FlushFileBuffers from kernelbase. Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 14 -------------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4ba80a624d8..dfedb443412 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -319,20 +319,6 @@ BOOL WINAPI KERNEL32_WriteFile( HANDLE file, LPCVOID buffer, DWORD count, } -/************************************************************************* - * FlushFileBuffers (KERNEL32.@) - */ -BOOL WINAPI KERNEL32_FlushFileBuffers( HANDLE file ) -{ - IO_STATUS_BLOCK iosb; - - /* this will fail (as expected) for an output handle */ - if (is_console_handle( file )) return FlushConsoleInputBuffer( file ); - - return set_ntstatus( NtFlushBuffersFile( file, &iosb )); -} - - /*********************************************************************** * DosDateTimeToFileTime (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 79964c7a9b3..5508a10f9a0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -518,7 +518,7 @@ @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) @ stdcall -import FlushConsoleInputBuffer(long) -@ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers +@ stdcall -import FlushFileBuffers(long) @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers @ stdcall -import FlushViewOfFile(ptr long)

1 0

Dmitry Timoshkov : advapi32/tests: Add QueryServiceStatusEx test for the EventLog service.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: de679af492ed93d70c99dff7f7cfc01cc8f25eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de679af492ed93d70c99dff7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 29 19:28:52 2020 +0300 advapi32/tests: Add QueryServiceStatusEx test for the EventLog service. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 22 ++++++++++++++++++++++ include/winsvc.h | 3 +++ 2 files changed, 25 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 817d0cb9ab0..d216e096207 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2684,6 +2684,7 @@ static void test_EventLog(void) DWORD size; BOOL ret; QUERY_SERVICE_CONFIGA *config; + SERVICE_STATUS_PROCESS status; scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_READ); ok(scm_handle != NULL, "OpenSCManager error %u\n", GetLastError()); @@ -2719,6 +2720,27 @@ todo_wine HeapFree(GetProcessHeap(), 0, config); + memset(&status, 0, sizeof(status)); + size = sizeof(status); + ret = QueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&status, size, &size); + ok(ret, "QueryServiceStatusEx error %u\n", GetLastError()); + ok(status.dwServiceType == SERVICE_WIN32_SHARE_PROCESS || + status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, + "got %#x\n", status.dwServiceType); + ok(status.dwCurrentState == SERVICE_RUNNING, "got %#x\n", status.dwCurrentState); +todo_wine + ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), + "got %#x\n", status.dwControlsAccepted); + ok(status.dwWin32ExitCode == 0, "got %#x\n", status.dwWin32ExitCode); + ok(status.dwServiceSpecificExitCode == 0, "got %#x\n", status.dwServiceSpecificExitCode); + ok(status.dwCheckPoint == 0, "got %#x\n", status.dwCheckPoint); + ok(status.dwWaitHint == 0, "got %#x\n", status.dwWaitHint); + ok(status.dwProcessId != 0, "got %#x\n", status.dwProcessId); + ok(status.dwServiceFlags == 0 || status.dwServiceFlags == SERVICE_RUNS_IN_SYSTEM_PROCESS /* XP */, + "got %#x\n", status.dwServiceFlags); + CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); } diff --git a/include/winsvc.h b/include/winsvc.h index aa5e9f1ae88..768ba5bf9b8 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -85,6 +85,8 @@ static const WCHAR SERVICES_FAILED_DATABASEW[] = { 'S','e','r','v','i','c','e',' #define SERVICE_ACCEPT_POWEREVENT 0x00000040 #define SERVICE_ACCEPT_SESSIONCHANGE 0x00000080 #define SERVICE_ACCEPT_PRESHUTDOWN 0x00000100 +#define SERVICE_ACCEPT_TIMECHANGE 0x00000200 +#define SERVICE_ACCEPT_TRIGGEREVENT 0x00000400 /* Service Control Manager Object access types */ #define SC_MANAGER_CONNECT 0x0001 @@ -124,6 +126,7 @@ static const WCHAR SERVICES_FAILED_DATABASEW[] = { 'S','e','r','v','i','c','e',' #define SERVICE_NO_CHANGE 0xffffffff +#define SERVICE_RUNS_IN_SYSTEM_PROCESS 0x00000001 /* Handle types */

1 0

Aaron Hill : cmd: Set errorlevel to 0 when 'call' is invoked with an empty string.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 8e54cad6a15b3901a748fa228d1a7e456911b9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e54cad6a15b3901a748fa22… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Mon Oct 12 17:36:05 2020 -0400 cmd: Set errorlevel to 0 when 'call' is invoked with an empty string. Previously, invoking 'call' with an empty string would leave errorlevel unchanged. Reset errorlevel to 0 to match the behavior of the Windows 'cmd.exe'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49982 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/wcmdmain.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 73b0917c275..c7418b759e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3149,6 +3149,9 @@ echo %ErrorLevel% should be 7 if errorlevel 7 echo setting var worked too well, bad call :setError 3 echo %ErrorLevel% should still be 7 +rem Verify that (call ) sets errorlevel to 0 +(call ) +if errorlevel 1 echo errorlevel should have been 0 echo ------------ Testing GOTO ------------ if a==a goto dest1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 47e43fcd675..2b55a39dca3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1053,6 +1053,11 @@ void WCMD_run_program (WCHAR *command, BOOL called) firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); if (!firstParam) return; + if (!firstParam[0]) { + errorlevel = 0; + return; + } + /* Calculate the search path and stem to search for */ if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'};

1 0

Huw Davies : riched20: Simplify the cursor from char offset function.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 57c2580a73b49c5f2dc035e6327f06ee590cbe85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c2580a73b49c5f2dc035e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:38 2020 +0100 riched20: Simplify the cursor from char offset function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 +-- dlls/riched20/editor.c | 47 ++++++++++++++------------- dlls/riched20/editor.h | 4 +-- dlls/riched20/richole.c | 84 +++++++++++++++++++++++++++---------------------- dlls/riched20/run.c | 66 ++++++++++++++------------------------ dlls/riched20/txtsrv.c | 2 +- dlls/riched20/undo.c | 12 +++---- 7 files changed, 103 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57c2580a73b49c5f2dc0…

1 0

Nikolay Sivov : mf/evr: Add default attributes on sink creation.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 602a3085e3630487b5a1957c1e4a9aab2cbed343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602a3085e3630487b5a1957c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:54 2020 +0300 mf/evr: Add default attributes on sink creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 12 ++++++++++++ dlls/mf/tests/mf.c | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 7665725405e..af9bd9e0e42 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1896,6 +1896,18 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IMFTransform_Release(mixer); IMFVideoPresenter_Release(presenter); + /* Default attributes */ + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceBob, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToBob, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceThrottle, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToThrottle, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceHalfInterlace, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToHalfInterlace, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceScaling, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowScaling, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceBatching, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowBatching, 0); + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fa3d8111338..465bd7e3c43 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3291,7 +3291,6 @@ static void test_evr(void) IUnknown_Release(unk); hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(!!count, "Unexpected count %u.\n", count); IMFAttributes_Release(attributes);

1 0

Jacek Caban : kernel32/tests: Add more FlushConsoleInputBuffer tests.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 591cb80dea8c094539b4bc4ab640b00538c6e06a URL: https://source.winehq.org/git/wine.git/?a=commit;h=591cb80dea8c094539b4bc4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:30 2020 +0200 kernel32/tests: Add more FlushConsoleInputBuffer tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ddd5bfcb4c4..495fa1b9e57 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1970,6 +1970,63 @@ static void test_WriteConsoleInputW(HANDLE input_handle) ok(ret == TRUE, "Expected SetConsoleMode to return TRUE, got %d\n", ret); } +static void test_FlushConsoleInputBuffer(HANDLE input, HANDLE output) +{ + INPUT_RECORD record; + DWORD count; + BOOL ret; + + ret = FlushConsoleInputBuffer(input); + ok(ret, "FlushConsoleInputBuffer failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + record.EventType = KEY_EVENT; + record.Event.KeyEvent.bKeyDown = 1; + record.Event.KeyEvent.wRepeatCount = 1; + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; + record.Event.KeyEvent.uChar.UnicodeChar = '\r'; + record.Event.KeyEvent.dwControlKeyState = 0; + ret = WriteConsoleInputW(input, &record, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 1, "Expected count to be 0, got %u\n", count); + + ret = FlushConsoleInputBuffer(input); + ok(ret, "FlushConsoleInputBuffer failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + ret = WriteConsoleInputW(input, &record, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 1, "Expected count to be 0, got %u\n", count); + + ret = FlushFileBuffers(input); + ok(ret, "FlushFileBuffers failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + ret = FlushConsoleInputBuffer(output); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FlushConsoleInputBuffer returned: %x(%u)\n", + ret, GetLastError()); + + ret = FlushFileBuffers(output); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FlushFileBuffers returned: %x(%u)\n", + ret, GetLastError()); +} + static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) { static const char output[] = {'a', 0}; @@ -4269,6 +4326,7 @@ START_TEST(console) test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn); + test_FlushConsoleInputBuffer(hConIn, hConOut); test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut);

1 0

Jacek Caban : server: Implement console input flush in server.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 746ece1a086f8fb721766fc8a4677606e722e4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=746ece1a086f8fb721766fc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:43 2020 +0200 server: Implement console input flush in server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 8ac3a08abc7..d1e3cae8919 100644 --- a/server/console.c +++ b/server/console.c @@ -3,6 +3,7 @@ * * Copyright (C) 1998 Alexandre Julliard * 2001 Eric Pouech + * Copyright 2020 Jacek Caban for CodeWeavers * * * This library is free software; you can redistribute it and/or @@ -96,6 +97,7 @@ static const struct object_ops console_input_ops = }; static enum server_fd_type console_get_fd_type( struct fd *fd ); +static int console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_input_fd_ops = @@ -105,7 +107,7 @@ static const struct fd_ops console_input_fd_ops = console_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ no_fd_write, /* write */ - no_fd_flush, /* flush */ + console_input_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ @@ -409,7 +411,7 @@ static int queue_host_ioctl( struct console_server *server, unsigned int code, u list_add_tail( &server->queue, &ioctl->entry ); wake_up( &server->obj, 0 ); if (async) set_error( STATUS_PENDING ); - return 0; + return 1; } static void disconnect_console_server( struct console_server *server ) @@ -831,6 +833,18 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } } +static int console_input_flush( struct fd *fd, struct async *async ) +{ + struct console_input *console = get_fd_user( fd ); + + if (!console->server) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); +} + static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct screen_buffer *screen_buffer = get_fd_user( fd );

1 0

Jacek Caban : kernel32: Use new IOCTL_CONDRV_SCROLL ioctl for FlushConsoleInputBuffer implementation.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 6f05b299bce211ef11dd5b046da4247e111cb91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f05b299bce211ef11dd5b04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:36 2020 +0200 kernel32: Use new IOCTL_CONDRV_SCROLL ioctl for FlushConsoleInputBuffer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 28 +--------------------------- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 2b46fe5589f..f9d24f5c885 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -148,38 +148,12 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) } -/****************************************************************************** - * read_console_input - * - * Helper function for ReadConsole, ReadConsoleInput and FlushConsoleInputBuffer - * - * Returns - * 0 for error, 1 for no INPUT_RECORD ready, 2 with INPUT_RECORD ready - */ -enum read_console_input_return {rci_error = 0, rci_timeout = 1, rci_gotone = 2}; - -static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_RECORD ir, DWORD timeout) -{ - int blocking = timeout != 0; - DWORD read_bytes; - - if (!DeviceIoControl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), ir, sizeof(*ir), &read_bytes, NULL )) - return rci_error; - return read_bytes ? rci_gotone : rci_timeout; -} - - /*********************************************************************** * FlushConsoleInputBuffer (KERNEL32.@) */ BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) { - enum read_console_input_return last; - INPUT_RECORD ir; - - while ((last = read_console_input(handle, &ir, 0)) == rci_gotone); - - return last == rci_timeout; + return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL ); } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index eed8bc5bfcf..cf2524edc66 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -39,6 +39,7 @@ #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 18, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_BEEP CTL_CODE(FILE_DEVICE_CONSOLE, 19, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_CONDRV_FLUSH CTL_CODE(FILE_DEVICE_CONSOLE, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a93f9be73b2..8fb28e18ba9 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2321,8 +2321,8 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return scroll_output( screen_buffer, in_data ); default: - FIXME( "unsupported ioctl %x\n", code ); - return STATUS_NOT_SUPPORTED; + WARN( "invalid ioctl %x\n", code ); + return STATUS_INVALID_HANDLE; } } @@ -2439,6 +2439,12 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, } return STATUS_SUCCESS; + case IOCTL_CONDRV_FLUSH: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + TRACE( "flush\n" ); + console->record_count = 0; + return STATUS_SUCCESS; + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Huw Davies : riched20: Use a run ptr in GetXForArrow().
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: a9a2a68be96ede0c62dbd259cb2d1f6a7f0ec20d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9a2a68be96ede0c62dbd259… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:41 2020 +0100 riched20: Use a run ptr in GetXForArrow(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4764dec8f33..ffea3ee0c35 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1215,21 +1215,23 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_DisplayItem *pRun = pCursor->pRun; + ME_Run *run = &pCursor->pRun->member.run; int x; if (editor->nUDArrowX != -1) x = editor->nUDArrowX; - else { + else + { if (editor->bCaretAtEnd) { - pRun = ME_FindItemBack(pRun, diRun); - assert(pRun); - x = pRun->member.run.pt.x + pRun->member.run.nWidth; + run = run_prev_all_paras( run ); + assert( run ); + x = run->pt.x + run->nWidth; } - else { - x = pRun->member.run.pt.x; - x += ME_PointFromChar(editor, &pRun->member.run, pCursor->nOffset, TRUE); + else + { + x = run->pt.x; + x += ME_PointFromChar( editor, run, pCursor->nOffset, TRUE ); } editor->nUDArrowX = x; }

1 0

Huw Davies : riched20: Use run ptrs in GetCharFormat().
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 1994d21ddb45341ef84f6381331f6bc2cf7ebd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1994d21ddb45341ef84f6381… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:37 2020 +0100 riched20: Use run ptrs in GetCharFormat(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 67 ++++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index a5888960f38..75195e343ed 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -816,9 +816,9 @@ void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, } } -static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) +static void run_copy_char_fmt( ME_Run *run, CHARFORMAT2W *fmt ) { - ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); + ME_CopyCharFormat( fmt, &run->style->fmt ); } /****************************************************************************** @@ -856,33 +856,25 @@ void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * Returns the style consisting of those attributes which are consistently set * in the whole character range. */ -void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, - const ME_Cursor *to, CHARFORMAT2W *pFmt) +void ME_GetCharFormat( ME_TextEditor *editor, const ME_Cursor *from, + const ME_Cursor *to, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *run_end; + ME_Run *run, *run_end, *prev_run; CHARFORMAT2W tmp; - run = from->pRun; + run = &from->pRun->member.run; /* special case - if selection is empty, take previous char's formatting */ if (from->pRun == to->pRun && from->nOffset == to->nOffset) { - if (!from->nOffset) - { - ME_DisplayItem *tmp_run = ME_FindItemBack(run, diRunOrParagraph); - if (tmp_run->type == diRun) { - ME_GetRunCharFormat(editor, tmp_run, pFmt); - return; - } - } - ME_GetRunCharFormat(editor, run, pFmt); + if (!from->nOffset && (prev_run = run_prev( run ))) run = prev_run; + run_copy_char_fmt( run, fmt ); return; } - run_end = to->pRun; - if (!to->nOffset) - run_end = ME_FindItemBack(run_end, diRun); + run_end = &to->pRun->member.run; + if (!to->nOffset) run_end = run_prev_all_paras( run_end ); - ME_GetRunCharFormat(editor, run, pFmt); + run_copy_char_fmt( run, fmt ); if (run == run_end) return; @@ -891,40 +883,37 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, DWORD dwAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; DWORD dwEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; - run = ME_FindItemFwd(run, diRun); + run = run_next_all_paras( run ); - ZeroMemory(&tmp, sizeof(tmp)); + memset( &tmp, 0, sizeof(tmp) ); tmp.cbSize = sizeof(tmp); - ME_GetRunCharFormat(editor, run, &tmp); + run_copy_char_fmt( run, &tmp ); assert((tmp.dwMask & dwAttribs) == dwAttribs); /* reset flags that differ */ - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->dwMask & CFM_FACE) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->dwMask & CFM_FACE) { if (!(tmp.dwMask & CFM_FACE)) - pFmt->dwMask &= ~CFM_FACE; - else if (wcscmp(pFmt->szFaceName, tmp.szFaceName) || - pFmt->bPitchAndFamily != tmp.bPitchAndFamily) - pFmt->dwMask &= ~CFM_FACE; + fmt->dwMask &= ~CFM_FACE; + else if (wcscmp( fmt->szFaceName, tmp.szFaceName ) || + fmt->bPitchAndFamily != tmp.bPitchAndFamily) + fmt->dwMask &= ~CFM_FACE; } - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->bUnderlineType != tmp.bUnderlineType) - pFmt->dwMask &= ~CFM_UNDERLINETYPE; - if (pFmt->dwMask & CFM_COLOR) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->bUnderlineType != tmp.bUnderlineType) fmt->dwMask &= ~CFM_UNDERLINETYPE; + if (fmt->dwMask & CFM_COLOR) { - if (!((pFmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) + if (!((fmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) { - if (pFmt->crTextColor != tmp.crTextColor) - pFmt->dwMask &= ~CFM_COLOR; + if (fmt->crTextColor != tmp.crTextColor) + fmt->dwMask &= ~CFM_COLOR; } } - pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & dwEffects); - pFmt->dwEffects = tmp.dwEffects; + fmt->dwMask &= ~((fmt->dwEffects ^ tmp.dwEffects) & dwEffects); + fmt->dwEffects = tmp.dwEffects; } while(run != run_end); }

1 0

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

Oct. 15, 2020

Module: wine Branch: master Commit: 0e8c432051b09d3bc3558ba2dc94392724c80d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8c432051b09d3bc3558ba2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:21:59 2020 +0200 msisip: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisip/main.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index aabea78ae62..11893f149c3 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -52,21 +52,13 @@ static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, */ HRESULT WINAPI DllRegisterServer(void) { - static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 }; - static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR createIndirectData[] = { 'M','s','i','S','I','P', - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P', - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m', - 'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 }; - static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P', - 'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 }; + static WCHAR msisip[] = L"MSISIP.DLL"; + static WCHAR getSignedDataMsg[] = L"MsiSIPGetSignedDataMsg"; + static WCHAR putSignedDataMsg[] = L"MsiSIPPutSignedDataMsg"; + static WCHAR createIndirectData[] = L"MsiSIPCreateIndirectData"; + static WCHAR verifyIndirectData[] = L"MsiSIPVerifyIndirectData"; + static WCHAR removeSignedDataMsg[] = L"MsiSIPRemoveSignedDataMsg"; + static WCHAR isMyTypeOfFile[] = L"MsiSIPIsMyTypeOfFile"; SIP_ADD_NEWPROVIDER prov; @@ -100,8 +92,6 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, BYTE *pbSignedDataMsg) { - static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l', - 'S','i','g','n','a','t','u','r','e',0 }; BOOL ret = FALSE; IStorage *stg = NULL; HRESULT r; @@ -120,7 +110,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, goto end; } - r = IStorage_OpenStream(stg, digitalSig, 0, + r = IStorage_OpenStream(stg, L"\5DigitalSignature", 0, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm); if (FAILED(r)) {

1 0

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

Oct. 15, 2020

Module: wine Branch: master Commit: 6873f8f1d07bf4569436f84d180a3789ee594600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6873f8f1d07bf4569436f84d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:00 2020 +0200 spoolss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/router.c | 2 +- dlls/spoolss/spoolss_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 764721b202c..24314b1f23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -151,7 +151,7 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ################################ */ -static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; +static WCHAR localsplW[] = L"localspl.dll"; /****************************************************************** * strdupW [internal] diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 61c565d2faa..bee58755eee 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); static HMODULE hwinspool; -static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; - /****************************************************************************** * */ @@ -232,7 +230,7 @@ BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) TRACE("(%p)\n", table); - hwinspool = LoadLibraryW(winspooldrvW); + hwinspool = LoadLibraryW(L"winspool.drv"); if (!hwinspool) return FALSE; table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW");

1 0

Alexandre Julliard : ntdll: Make NtGetNlsSectionPtr() into a proper Nt syscall.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 54c31d5332a71d785db1b73cf3be41818adeab8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=54c31d5332a71d785db1b73c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 20:17:46 2020 +0200 ntdll: Make NtGetNlsSectionPtr() into a proper Nt syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 12 +-- dlls/ntdll/locale.c | 184 +------------------------------------------ dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/unix/env.c | 153 ++++++++++++++++++++++++++++++++--- 4 files changed, 151 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54c31d5332a71d785db1…

1 0