October 2020 - Wine-Commits

Jacek Caban : server: Remove no longer used console requests.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: dc6f6e9ef3d6f9c99eb743d779174e5759f091e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6f6e9ef3d6f9c99eb743d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:29:03 2020 +0200 server: Remove no longer used console requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 92 +------------------------ server/console.c | 153 ----------------------------------------- server/protocol.def | 42 ----------- server/request.h | 31 --------- server/trace.c | 63 ----------------- 5 files changed, 1 insertion(+), 380 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc6f6e9ef3d6f9c99eb7…

1 0

Jacek Caban : kernel32: Always use conhost for ReadConsoleW.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 633b244b1ae7928cafbfd25ef338e4918aac0d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633b244b1ae7928cafbfd25e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:38 2020 +0200 kernel32: Always use conhost for ReadConsoleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/console.c | 178 +------ dlls/kernel32/console_private.h | 34 -- dlls/kernel32/editline.c | 1044 --------------------------------------- dlls/kernel32/kernel_main.c | 1 - 5 files changed, 9 insertions(+), 1249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=633b244b1ae7928cafbf…

1 0

Jacek Caban : kernel32: Always use conhost for WriteConsoleW.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 143c210360ab4b3232fc5cdbf5c5c56d8001ace4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=143c210360ab4b3232fc5cdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:11 2020 +0200 kernel32: Always use conhost for WriteConsoleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 207 +++--------------------------------------------- 1 file changed, 10 insertions(+), 197 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index e56a09516d..37e36730a9 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -357,116 +357,6 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons) return TRUE; } -/****************************************************************** - * CONSOLE_WriteChars - * - * WriteConsoleOutput helper: hides server call semantics - * writes a string at a given pos with standard attribute - */ -static int CONSOLE_WriteChars(HANDLE handle, const WCHAR *str, size_t length, COORD *coord) -{ - struct condrv_output_params *params; - DWORD written = 0, size; - - if (!length) return 0; - - size = sizeof(*params) + length * sizeof(WCHAR); - if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; - params->mode = CHAR_INFO_MODE_TEXTSTDATTR; - params->x = coord->X; - params->y = coord->Y; - params->width = 0; - memcpy( params + 1, str, length * sizeof(*str) ); - if (DeviceIoControl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, - &written, sizeof(written), NULL, NULL )) - coord->X += written; - HeapFree( GetProcessHeap(), 0, params ); - return written; -} - -/****************************************************************** - * next_line - * - * WriteConsoleOutput helper: handles passing to next line (+scrolling if necessary) - * - */ -static BOOL next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) -{ - SMALL_RECT src; - CHAR_INFO ci; - COORD dst; - - csbi->dwCursorPosition.X = 0; - csbi->dwCursorPosition.Y++; - - if (csbi->dwCursorPosition.Y < csbi->dwSize.Y) return TRUE; - - src.Top = 1; - src.Bottom = csbi->dwSize.Y - 1; - src.Left = 0; - src.Right = csbi->dwSize.X - 1; - - dst.X = 0; - dst.Y = 0; - - ci.Attributes = csbi->wAttributes; - ci.Char.UnicodeChar = ' '; - - csbi->dwCursorPosition.Y--; - if (!ScrollConsoleScreenBufferW(hCon, &src, NULL, dst, &ci)) - return FALSE; - return TRUE; -} - -/****************************************************************** - * write_block - * - * WriteConsoleOutput helper: writes a block of non special characters - * Block can spread on several lines, and wrapping, if needed, is - * handled - * - */ -static BOOL write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, - DWORD mode, LPCWSTR ptr, int len) -{ - int blk; /* number of chars to write on current line */ - int done; /* number of chars already written */ - - if (len <= 0) return TRUE; - - if (mode & ENABLE_WRAP_AT_EOL_OUTPUT) /* writes remaining on next line */ - { - for (done = 0; done < len; done += blk) - { - blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); - - if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return FALSE; - if (csbi->dwCursorPosition.X == csbi->dwSize.X && !next_line(hCon, csbi)) - return FALSE; - } - } - else - { - int pos = csbi->dwCursorPosition.X; - /* FIXME: we could reduce the number of loops - * but, in most cases we wouldn't gain lots of time (it would only - * happen if we're asked to overwrite more than twice the part of the line, - * which is unlikely - */ - for (done = 0; done < len; done += blk) - { - blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); - - csbi->dwCursorPosition.X = pos; - if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return FALSE; - } - } - - return TRUE; -} - /*********************************************************************** * WriteConsoleA (KERNEL32.@) @@ -492,95 +382,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleA( HANDLE handle, LPCVOID buffer, DWOR /*********************************************************************** * WriteConsoleW (KERNEL32.@) */ -BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumberOfCharsToWrite, - LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved) -{ - DWORD mode; - DWORD nw = 0; - const WCHAR* psz = lpBuffer; - CONSOLE_SCREEN_BUFFER_INFO csbi; - int k, first = 0; - IO_STATUS_BLOCK io; - - TRACE("%p %s %d %p %p\n", - hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite), - nNumberOfCharsToWrite, lpNumberOfCharsWritten, lpReserved); - - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; - - if (!NtDeviceIoControlFile(hConsoleOutput, NULL, NULL, NULL, &io, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, - nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0)) - { - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; - return TRUE; - } - - if (!GetConsoleMode(hConsoleOutput, &mode) || !GetConsoleScreenBufferInfo(hConsoleOutput, &csbi)) - return FALSE; - - if (!nNumberOfCharsToWrite) return TRUE; - - if (mode & ENABLE_PROCESSED_OUTPUT) - { - unsigned int i; - - for (i = 0; i < nNumberOfCharsToWrite; i++) - { - switch (psz[i]) - { - case '\b': case '\t': case '\n': case '\a': case '\r': - /* don't handle here the i-th char... done below */ - if ((k = i - first) > 0) - { - if (!write_block(hConsoleOutput, &csbi, mode, &psz[first], k)) - goto the_end; - nw += k; - } - first = i + 1; - nw++; - } - switch (psz[i]) - { - case '\b': - if (csbi.dwCursorPosition.X > 0) csbi.dwCursorPosition.X--; - break; - case '\t': - { - static const WCHAR tmp[] = {' ',' ',' ',' ',' ',' ',' ',' '}; - if (!write_block(hConsoleOutput, &csbi, mode, tmp, - ((csbi.dwCursorPosition.X + 8) & ~7) - csbi.dwCursorPosition.X)) - goto the_end; - } - break; - case '\n': - next_line(hConsoleOutput, &csbi); - break; - case '\a': - Beep(400, 300); - break; - case '\r': - csbi.dwCursorPosition.X = 0; - break; - default: - break; - } - } - } +BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer, DWORD length, + DWORD *written, void *reserved ) +{ + BOOL ret; - /* write the remaining block (if any) if processed output is enabled, or the - * entire buffer otherwise - */ - if ((k = nNumberOfCharsToWrite - first) > 0) - { - if (!write_block(hConsoleOutput, &csbi, mode, &psz[first], k)) - goto the_end; - nw += k; - } + TRACE( "(%p,%s,%d,%p,%p)\n", handle, debugstr_wn(buffer, length), length, written, reserved ); - the_end: - SetConsoleCursorPosition(hConsoleOutput, csbi.dwCursorPosition); - if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nw; - return nw != 0; + ret = DeviceIoControl( handle, IOCTL_CONDRV_WRITE_CONSOLE, (void *)buffer, + length * sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (written) *written = ret ? length : 0; + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; }

1 0

Henri Verbeet : wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE).
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 1b192ce4cbd12e2a42fd59cfde73abe332a1f9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b192ce4cbd12e2a42fd59cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:55 2020 +0330 wined3d: Do not invalidate STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE). This is no longer used internally; two-sided stencil is handled as part of STATE_DEPTH_STENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3381252e75..2f42a41754 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -510,10 +510,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct if (gl_mask & GL_STENCIL_BUFFER_BIT) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0U); context_invalidate_state(context, STATE_DEPTH_STENCIL); } @@ -5389,10 +5386,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (flags & WINED3DCLEAR_STENCIL) { if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) - { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE)); - } gl_info->gl_ops.gl.p_glStencilMask(~0u); context_invalidate_state(context, STATE_DEPTH_STENCIL); gl_info->gl_ops.gl.p_glClearStencil(stencil);

1 0

Nikolay Sivov : evr/tests: Add a test for MF_SA_REQUIRED_SAMPLE_COUNT.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 25872a51727d893296633c3734447304c566cc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25872a51727d893296633c37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:46 2020 +0300 evr/tests: Add a test for MF_SA_REQUIRED_SAMPLE_COUNT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7a51b3c17d..72642110a7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -658,6 +658,12 @@ todo_wine attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + hr = IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); ok(!!attributes, "Unexpected attributes.\n"); attributes2 = NULL;

1 0

Jacek Caban : kernel32: Move ReadConsole and WriteConsole to kernelbase.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 98dcd3a7ead292eee3cdd1825380ccbb8a69dbc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98dcd3a7ead292eee3cdd182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:27:55 2020 +0200 kernel32: Move ReadConsole and WriteConsole to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 86 ----------------------------------------- dlls/kernel32/kernel32.spec | 8 ++-- dlls/kernelbase/console.c | 85 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 8 ++-- 4 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98dcd3a7ead292eee3cd…

1 0

Nikolay Sivov : mf/evr: Do not use IMFVideoMediaType when setting mixer types.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 4bdaeaeb48a9cd5fd08f7b2cdc17b5c062db787d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bdaeaeb48a9cd5fd08f7b2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:44 2020 +0300 mf/evr: Do not use IMFVideoMediaType when setting mixer types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c3548170af..298d320ec0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -362,35 +362,10 @@ static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -/* Mixer expects special video media type instance. */ -static HRESULT video_renderer_create_video_type(IMFMediaType *media_type, IMFVideoMediaType **video_type) -{ - GUID subtype; - HRESULT hr; - - *video_type = NULL; - - if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) - return hr; - - if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, video_type))) - return hr; - - hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)*video_type); - if (FAILED(hr)) - { - IMFVideoMediaType_Release(*video_type); - *video_type = NULL; - } - - return hr; -} - static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p, %p.\n", iface, in_type, out_type); @@ -401,17 +376,12 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType if (!stream->parent) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = video_renderer_create_video_type(in_type, &video_type))) - return hr; - - if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, + if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, in_type, MFT_SET_TYPE_TEST_ONLY))) { if (out_type) *out_type = NULL; } - IMFVideoMediaType_Release(video_type); - return hr; } @@ -438,7 +408,6 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p.\n", iface, type); @@ -449,11 +418,7 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH if (!stream->parent) return MF_E_STREAMSINK_REMOVED; - if (FAILED(hr = video_renderer_create_video_type(type, &video_type))) - return hr; - - hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); - IMFVideoMediaType_Release(video_type); + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0); return hr; }

1 0

Vijay Kiran Kamuju : hnetcfg: Return S_OK in get_StaticPortMappingCollection.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 5160c30fa75b631354586b528e3be2851a1909c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5160c30fa75b631354586b52… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Oct 10 12:44:44 2020 +0200 hnetcfg: Return S_OK in get_StaticPortMappingCollection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49449 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- dlls/hnetcfg/tests/policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index b0821d4b68..fd4ac4977d 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -720,7 +720,7 @@ static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, I FIXME("%p, %p\n", This, collection); if(collection) *collection = NULL; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 8701455841..416049c009 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -180,7 +180,7 @@ static void test_IUPnPNAT(void) ok(hr == E_NOINTERFACE, "got: %08x\n", hr); hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); - todo_wine ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08x\n", hr); if(hr == S_OK && static_ports) IStaticPortMappingCollection_Release(static_ports);

1 0

Huw Davies : riched20: Use paragraph ptrs in FindPixelPos().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 4366c81f49534b090b19a50285a828aaeb4bbf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4366c81f49534b090b19a502… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:35 2020 +0100 riched20: Use paragraph ptrs in FindPixelPos(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 56 +++++++++++++++++++++++++------------------------- dlls/riched20/editor.c | 4 ++++ dlls/riched20/editor.h | 1 + 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index dde0c7faad..1c3f4b1652 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -892,41 +892,41 @@ int ME_GetCursorOfs(const ME_Cursor *cursor) } /* Helper function for ME_FindPixelPos to find paragraph within tables */ -static ME_DisplayItem* ME_FindPixelPosInTableRow(int x, int y, - ME_DisplayItem *para) +static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) { ME_DisplayItem *cell, *next_cell; - assert(para->member.para.nFlags & MEPF_ROWSTART); - cell = para->member.para.next_para->member.para.pCell; + + assert( para->nFlags & MEPF_ROWSTART ); + cell = para_next( para )->pCell; assert(cell); /* find the cell we are in */ - while ((next_cell = cell->member.cell.next_cell) != NULL) { + while ((next_cell = cell->member.cell.next_cell) != NULL) + { if (x < next_cell->member.cell.pt.x) { - para = ME_FindItemFwd(cell, diParagraph); + para = &ME_FindItemFwd( cell, diParagraph )->member.para; /* Found the cell, but there might be multiple paragraphs in * the cell, so need to search down the cell for the paragraph. */ - while (cell == para->member.para.pCell) { - if (y < para->member.para.pt.y + para->member.para.nHeight) + while (cell == para->pCell) + { + if (y < para->pt.y + para->nHeight) { - if (para->member.para.nFlags & MEPF_ROWSTART) - return ME_FindPixelPosInTableRow(x, y, para); - else - return para; + if (para->nFlags & MEPF_ROWSTART) return pixel_pos_in_table_row( x, y, para ); + else return para; } - para = para->member.para.next_para; + para = para_next( para ); } /* Past the end of the cell, so go back to the last cell paragraph */ - return para->member.para.prev_para; + return para_prev( para ); } cell = next_cell; } /* Return table row delimiter */ - para = ME_FindItemFwd(cell, diParagraph); - assert(para->member.para.nFlags & MEPF_ROWEND); - assert(para->member.para.fmt.dwMask & PFM_TABLEROWDELIMITER); - assert(para->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER); + para = table_row_end( para ); + assert( para->nFlags & MEPF_ROWEND ); + assert( para->fmt.dwMask & PFM_TABLEROWDELIMITER ); + assert( para->fmt.wEffects & PFE_TABLEROWDELIMITER ); return para; } @@ -986,7 +986,7 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { - ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_Paragraph *para = editor_first_para( editor ); ME_DisplayItem *row = NULL; BOOL isExact = TRUE; @@ -997,19 +997,19 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, *is_eol = FALSE; /* find paragraph */ - for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) + for (; para_next( para ); para = para_next( para )) { - if (y < p->member.para.pt.y + p->member.para.nHeight) + if (y < para->pt.y + para->nHeight) { - if (p->member.para.nFlags & MEPF_ROWSTART) - p = ME_FindPixelPosInTableRow(x, y, p); - y -= p->member.para.pt.y; - row = ME_FindItemFwd(p, diStartRow); + if (para->nFlags & MEPF_ROWSTART) + para = pixel_pos_in_table_row( x, y, para ); + y -= para->pt.y; + row = ME_FindItemFwd( para_get_di( para ), diStartRow); break; } - else if (p->member.para.nFlags & MEPF_ROWSTART) + else if (para->nFlags & MEPF_ROWSTART) { - p = para_get_di( table_row_end( &p->member.para ) ); + para = table_row_end( para ); } } /* find row */ @@ -1029,7 +1029,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - row = ME_FindItemBack(p, diStartRow); + row = ME_FindItemBack( para_get_di( para ), diStartRow); } if (row) return ME_FindRunInRow( editor, row, x, result, is_eol ) && isExact; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e7e33c2758..a144137baa 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -280,6 +280,10 @@ static ME_TextBuffer *ME_MakeText(void) { return buf; } +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) +{ + return para_next( &editor->pBuffer->pFirst->member.para ); +} static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6b97a01f82..f61caa6478 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -268,6 +268,7 @@ void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; +ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN;

1 0

Daniel Lehman : tzres: Add Eastern Standard Time (Mexico) Zone.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 0adafcd62c339cbad322aec942d4f289c5b6e671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0adafcd62c339cbad322aec9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 12 20:16:07 2020 -0700 tzres: Add Eastern Standard Time (Mexico) Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 11 ++ po/ar.po | 286 +++++++++++++++++++++++++++------------------------ po/ast.po | 286 +++++++++++++++++++++++++++------------------------ po/bg.po | 282 ++++++++++++++++++++++++++------------------------ po/ca.po | 286 +++++++++++++++++++++++++++------------------------ po/cs.po | 286 +++++++++++++++++++++++++++------------------------ po/da.po | 286 +++++++++++++++++++++++++++------------------------ po/de.po | 286 +++++++++++++++++++++++++++------------------------ po/el.po | 282 ++++++++++++++++++++++++++------------------------ po/en.po | 282 ++++++++++++++++++++++++++------------------------ po/en_US.po | 282 ++++++++++++++++++++++++++------------------------ po/eo.po | 286 +++++++++++++++++++++++++++------------------------ po/es.po | 286 +++++++++++++++++++++++++++------------------------ po/fa.po | 284 ++++++++++++++++++++++++++------------------------ po/fi.po | 286 +++++++++++++++++++++++++++------------------------ po/fr.po | 286 +++++++++++++++++++++++++++------------------------ po/he.po | 286 +++++++++++++++++++++++++++------------------------ po/hi.po | 282 ++++++++++++++++++++++++++------------------------ po/hr.po | 286 +++++++++++++++++++++++++++------------------------ po/hu.po | 286 +++++++++++++++++++++++++++------------------------ po/it.po | 286 +++++++++++++++++++++++++++------------------------ po/ja.po | 286 +++++++++++++++++++++++++++------------------------ po/ko.po | 286 +++++++++++++++++++++++++++------------------------ po/lt.po | 286 +++++++++++++++++++++++++++------------------------ po/ml.po | 282 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 286 +++++++++++++++++++++++++++------------------------ po/nl.po | 286 +++++++++++++++++++++++++++------------------------ po/or.po | 282 ++++++++++++++++++++++++++------------------------ po/pa.po | 282 ++++++++++++++++++++++++++------------------------ po/pl.po | 286 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 286 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 286 +++++++++++++++++++++++++++------------------------ po/rm.po | 282 ++++++++++++++++++++++++++------------------------ po/ro.po | 286 +++++++++++++++++++++++++++------------------------ po/ru.po | 282 ++++++++++++++++++++++++++------------------------ po/si.po | 286 +++++++++++++++++++++++++++------------------------ po/sk.po | 286 +++++++++++++++++++++++++++------------------------ po/sl.po | 286 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 284 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 284 ++++++++++++++++++++++++++------------------------ po/sv.po | 286 +++++++++++++++++++++++++++------------------------ po/ta.po | 282 ++++++++++++++++++++++++++------------------------ po/te.po | 282 ++++++++++++++++++++++++++------------------------ po/th.po | 284 ++++++++++++++++++++++++++------------------------ po/tr.po | 286 +++++++++++++++++++++++++++------------------------ po/uk.po | 282 ++++++++++++++++++++++++++------------------------ po/wa.po | 284 ++++++++++++++++++++++++++------------------------ po/wine.pot | 282 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 286 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 286 +++++++++++++++++++++++++++------------------------ 51 files changed, 7248 insertions(+), 6713 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0adafcd62c339cbad322…

1 0