October 2020 - Wine-Commits

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