October 2016 - Wine-Commits

Huw Davies : riched20: Allow selecting the final end-of-paragraph when using the right arrow key.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 58a48aa79b0f763e44ce29523f26d1ad82a60584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a48aa79b0f763e44ce29523… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:33 2016 +0100 riched20: Allow selecting the final end-of-paragraph when using the right arrow key. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 15 ++++++++------- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/table.c | 2 +- dlls/riched20/undo.c | 2 +- dlls/riched20/writer.c | 5 +---- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 279bdcd..b137c5f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -200,7 +200,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) ME_CursorFromCharOfs(editor, from, &editor->pCursors[1]); editor->pCursors[0] = editor->pCursors[1]; - ME_MoveCursorChars(editor, &editor->pCursors[0], to - from); + ME_MoveCursorChars(editor, &editor->pCursors[0], to - from, FALSE); /* Selection is not allowed in the middle of an end paragraph run. */ if (editor->pCursors[1].pRun->member.run.nFlags & MERF_ENDPARA) editor->pCursors[1].nOffset = 0; @@ -627,10 +627,11 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } /* Move the cursor nRelOfs characters (either forwards or backwards) + * If final_eop is TRUE, allow moving the cursor to the end of the final eop. * * returns the actual number of characters moved. **/ -int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) { cursor->nOffset += nRelOfs; if (cursor->nOffset < 0) @@ -682,11 +683,11 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) return nRelOfs; } - if (new_offset >= ME_GetTextLength(editor)) + if (new_offset >= ME_GetTextLength(editor) + (final_eop ? 1 : 0)) { /* new offset at the end of the text */ - ME_SetCursorToEnd(editor, cursor, FALSE); - nRelOfs -= new_offset - ME_GetTextLength(editor); + ME_SetCursorToEnd(editor, cursor, final_eop); + nRelOfs -= new_offset - (ME_GetTextLength(editor) + (final_eop ? 1 : 0)); return nRelOfs; } @@ -1547,14 +1548,14 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, -1); else - success = ME_MoveCursorChars(editor, &tmp_curs, -1); + success = ME_MoveCursorChars(editor, &tmp_curs, -1, extend); break; case VK_RIGHT: editor->bCaretAtEnd = FALSE; if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, +1); else - success = ME_MoveCursorChars(editor, &tmp_curs, +1); + success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: ME_MoveCursorLines(editor, &tmp_curs, -1); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 97c2d59..4adc74f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1650,7 +1650,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre int linebreakSize = editor->bEmulateVersion10 ? 2 : 1; ME_Cursor linebreakCursor = *selEnd; - ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize); + ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); if (lastchar[0] == '\r' && (lastchar[1] == '\n' || lastchar[1] == '\0')) { ME_InternalDeleteText(editor, &linebreakCursor, linebreakSize, FALSE); @@ -1805,7 +1805,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { ME_CursorFromCharOfs(editor, nMin - 1, &cursor); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); - ME_MoveCursorChars(editor, &cursor, 1); + ME_MoveCursorChars(editor, &cursor, 1, FALSE); } else { ME_CursorFromCharOfs(editor, nMin, &cursor); } @@ -1881,7 +1881,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { ME_CursorFromCharOfs(editor, nMax + 1, &cursor); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); - ME_MoveCursorChars(editor, &cursor, -1); + ME_MoveCursorChars(editor, &cursor, -1, FALSE); } else { ME_CursorFromCharOfs(editor, nMax, &cursor); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cc1654a..c62b3a4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -178,7 +178,7 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) DECLS void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style) DECLSPEC_HIDDEN; void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; -int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) DECLSPEC_HIDDEN; BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl) DECLSPEC_HIDDEN; int ME_GetCursorOfs(const ME_Cursor *cursor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 77e7b57..c5f0441 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -451,7 +451,7 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, ME_CursorFromCharOfs(reole->editor, pos, &from); to = from; - ME_MoveCursorChars(reole->editor, &to, 1); + ME_MoveCursorChars(reole->editor, &to, 1, FALSE); ME_GetCharFormat(reole->editor, &from, &to, &fmt); switch (propid) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index c22f92a..b834bc7 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -291,7 +291,7 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC ME_DisplayItem *this_para = c->pPara; ME_DisplayItem *end_para; - ME_MoveCursorChars(editor, &c2, *nChars); + ME_MoveCursorChars(editor, &c2, *nChars, FALSE); end_para = c2.pPara; if (c2.pRun->member.run.nFlags & MERF_ENDPARA) { /* End offset might be in the middle of the end paragraph run. diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 7a8c333..582f888 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -349,7 +349,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) ME_Cursor start, end; ME_CursorFromCharOfs(editor, undo->u.set_char_fmt.pos, &start); end = start; - ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len); + ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len, FALSE); ME_SetCharFormat(editor, &start, &end, &undo->u.set_char_fmt.fmt); break; } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a3eaffe..0204215 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -881,11 +881,8 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, ME_Cursor cursor = *start; ME_DisplayItem *prev_para = cursor.pPara; ME_Cursor endCur = cursor; - int actual_chars; - actual_chars = ME_MoveCursorChars(editor, &endCur, nChars); - /* Include the final \r which MoveCursorChars will ignore. */ - if (actual_chars != nChars) endCur.nOffset++; + ME_MoveCursorChars(editor, &endCur, nChars, TRUE); if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE;

1 0

Hans Leidekker : webservices: Add support for writing WS_DATETIME values.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 503d152bfb5023a77ce30f7a22c938e2f3b16e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503d152bfb5023a77ce30f7a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:34 2016 +0200 webservices: Add support for writing WS_DATETIME values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 23 +------- dlls/webservices/tests/writer.c | 88 ++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 18 +++++++ dlls/webservices/writer.c | 98 ++++++++++++++++++++++++++++++++++ include/webservices.h | 6 +++ 5 files changed, 212 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=503d152bfb5023a77ce30…

1 0

Hans Leidekker : advapi32: Add a stub implementation of EnableTraceEx2.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: bacc68822aec1a025bc0e8c7aab7b75061e1c8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacc68822aec1a025bc0e8c7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:32 2016 +0200 advapi32: Add a stub implementation of EnableTraceEx2. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 14 ++++++++++++++ .../api-ms-win-eventing-controller-l1-1-0.spec | 2 +- include/evntrace.h | 13 +++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index c2a8d01..b1a051c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -248,7 +248,7 @@ @ stub ElfReportEventW @ stdcall EnableTrace(long long long ptr int64) @ stdcall EnableTraceEx(ptr ptr int64 long long int64 int64 long ptr) -# @ stub EnableTraceEx2 +@ stdcall EnableTraceEx2(int64 ptr long long int64 int64 long ptr) @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) # @ stub EncryptedFileKeyInfo diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index f947511..893f6e5 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -239,6 +239,20 @@ ULONG WINAPI EnableTraceEx( LPCGUID provider, LPCGUID source, TRACEHANDLE hSessi } /****************************************************************************** + * EnableTraceEx2 [ADVAPI32.@] + */ +ULONG WINAPI EnableTraceEx2( TRACEHANDLE handle, LPCGUID provider, ULONG control, UCHAR level, + ULONGLONG match_any, ULONGLONG match_all, ULONG timeout, + PENABLE_TRACE_PARAMETERS params ) +{ + FIXME("(%s, %s, %u, %c, %s, %s, %u, %p): stub\n", wine_dbgstr_longlong(handle), + debugstr_guid(provider), control, level, wine_dbgstr_longlong(match_any), + wine_dbgstr_longlong(match_all), timeout, params); + + return ERROR_SUCCESS; +} + +/****************************************************************************** * EnableTrace [ADVAPI32.@] */ ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) diff --git a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec index a418637..0b58510 100644 --- a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW -@ stub EnableTraceEx2 +@ stdcall EnableTraceEx2(int64 ptr long long int64 int64 long ptr) advapi32.EnableTraceEx2 @ stub EnumerateTraceGuidsEx @ stub EventAccessControl @ stub EventAccessQuery diff --git a/include/evntrace.h b/include/evntrace.h index 191f232..6ebcfba 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -248,6 +248,18 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; +typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; + +typedef struct _ENABLE_TRACE_PARAMETERS +{ + ULONG Version; + ULONG EnableProperty; + ULONG ControlFlags; + GUID SourceId; + PEVENT_FILTER_DESCRIPTOR EnableFilterDesc; + ULONG FilterDescCount; +} ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; + #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) ULONG WINAPI CloseTrace(TRACEHANDLE); @@ -255,6 +267,7 @@ ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); #define ControlTrace WINELIB_NAME_AW(ControlTrace) ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); +ULONG WINAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace)

1 0

Piotr Caban : msvcp140/tests: Test virtual base table size exports.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: ca862a3849f481e87cc2c1ed5b9b0de60526355d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca862a3849f481e87cc2c1ed5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 4 10:10:05 2016 +0200 msvcp140/tests: Test virtual base table size exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index d54ced3..82e2b34 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -47,9 +47,45 @@ static void test_thrd(void) p__Thrd_id(), GetCurrentThreadId()); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x20, 0x20}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); + test_vbtable_size_exports(); FreeLibrary(msvcp); }

1 0

Matteo Bruni : wined3d: Add ARB_clip_control extension.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 94956da913dfe49047aa81f8468e80eb3a495e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94956da913dfe49047aa81f84… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:55 2016 +0200 wined3d: Add ARB_clip_control extension. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b4394b8..b03ddf6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -109,6 +109,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, + {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, @@ -2580,6 +2581,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) + /* GL_ARB_clip_control */ + USE_GL_FUNC(glClipControl) /* GL_ARB_color_buffer_float */ USE_GL_FUNC(glClampColorARB) /* GL_ARB_copy_buffer */ @@ -3607,6 +3610,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, + {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 57fbea4..b71190d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension APPLE_YCBCR_422, /* ARB */ ARB_BLEND_FUNC_EXTENDED, + ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT,

1 0

Matteo Bruni : wined3d: Avoid vpos fixups when ARB_fragment_coord_conventions is supported.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: a7f846b2ee82ae99b8a0ad6d1569b74e0198d639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f846b2ee82ae99b8a0ad6d1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:52 2016 +0200 wined3d: Avoid vpos fixups when ARB_fragment_coord_conventions is supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 26 ++++++++++++++++++++++---- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e09c6fd..8c08310 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2418,6 +2418,8 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context_invalidate_state(context, STATE_VIEWPORT); context_invalidate_state(context, STATE_SCISSORRECT); context_invalidate_state(context, STATE_FRONTFACE); + if (context->gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); context->render_offscreen = offscreen; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 55cbdcf..72740af 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2194,9 +2194,23 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (reg_maps->vpos || reg_maps->usesdsy) { - ++extra_constants_needed; - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - shader_addline(buffer, "vec4 vpos;\n"); + if (reg_maps->usesdsy || !gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + { + ++extra_constants_needed; + shader_addline(buffer, "uniform vec4 ycorrection;\n"); + } + if (reg_maps->vpos) + { + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + { + if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", + ps_args->render_offscreen ? "" : "origin_upper_left, "); + else if (!ps_args->render_offscreen) + shader_addline(buffer, "layout(origin_upper_left) in vec4 gl_FragCoord;\n"); + } + shader_addline(buffer, "vec4 vpos;\n"); + } } if (ps_args->alpha_test_func + 1 != WINED3D_CMP_ALWAYS) @@ -5899,6 +5913,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + shader_addline(buffer, "#extension GL_ARB_fragment_coord_conventions : enable\n"); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); /* The spec says that it doesn't have to be explicitly enabled, but the @@ -5929,7 +5945,9 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context * on drivers that returns integer values. */ if (reg_maps->vpos) { - if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + shader_addline(buffer, "vpos = gl_FragCoord;\n"); + else if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); else diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1c48589..594520c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3279,6 +3279,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (d3d_info->emulated_flatshading) args->flatshading = state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT; + + args->render_offscreen = gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] ? context->render_offscreen : 0; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a968bda..851c914 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1107,7 +1107,8 @@ struct ps_compile_args { DWORD pointsprite : 1; DWORD flatshading : 1; DWORD alpha_test_func : 3; - DWORD padding : 27; + DWORD render_offscreen : 1; + DWORD padding : 26; }; enum fog_src_type {

1 0

Hans Leidekker : webservices: Add support for reading WS_BYTES values.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 8ce55bc98f0882d6573b7cc56623017ff28eeb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce55bc98f0882d6573b7cc56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:35 2016 +0200 webservices: Add support for reading WS_BYTES values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 157 +++++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 22 ++++++ include/webservices.h | 13 ++++ 3 files changed, 180 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ce55bc98f0882d6573b7…

1 0

Hans Leidekker : webservices: Add support for writing WS_BYTES values.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: c8a90e5de9305b3b34c2094c59fa3781d9be8c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a90e5de9305b3b34c2094c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:36 2016 +0200 webservices: Add support for writing WS_BYTES values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 100 ++++++++++++++++++++++------------------ dlls/webservices/writer.c | 75 ++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a90e5de9305b3b34c20…

1 0

Huw Davies : riched20: Add an option to move the cursor to after the final end-of-paragraph.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: c005b98d9119138f8cfea1b6b5be4f5c78ca8d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c005b98d9119138f8cfea1b6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:32 2016 +0100 riched20: Add an option to move the cursor to after the final end-of-paragraph. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e5c60a0..279bdcd 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -31,11 +31,11 @@ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) cursor->nOffset = 0; } -static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor) +static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL final_eop) { cursor->pPara = editor->pBuffer->pLast->member.para.prev_para; cursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - cursor->nOffset = 0; + cursor->nOffset = final_eop ? cursor->pRun->member.run.len : 0; } @@ -83,7 +83,7 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) int ME_GetTextLength(ME_TextEditor *editor) { ME_Cursor cursor; - ME_SetCursorToEnd(editor, &cursor); + ME_SetCursorToEnd(editor, &cursor, FALSE); return ME_GetCursorOfs(&cursor); } @@ -138,8 +138,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (from == 0 && to == -1) { ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0]); - editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); ME_InvalidateSelection(editor); return len + 1; } @@ -193,7 +192,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (selectionEnd) { - ME_SetCursorToEnd(editor, &editor->pCursors[0]); + ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); editor->pCursors[1] = editor->pCursors[0]; ME_InvalidateSelection(editor); return len; @@ -686,7 +685,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) if (new_offset >= ME_GetTextLength(editor)) { /* new offset at the end of the text */ - ME_SetCursorToEnd(editor, cursor); + ME_SetCursorToEnd(editor, cursor, FALSE); nRelOfs -= new_offset - ME_GetTextLength(editor); return nRelOfs; } @@ -859,7 +858,7 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) /* Select everything with cursor anchored from the start of the text */ editor->nSelectionType = stDocument; ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0]); + ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); break; default: assert(0); } @@ -1383,7 +1382,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) { - ME_SetCursorToEnd(editor, pCursor); + ME_SetCursorToEnd(editor, pCursor, FALSE); editor->bCaretAtEnd = FALSE; } else { ME_DisplayItem *pRun = pCursor->pRun; @@ -1480,7 +1479,7 @@ static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_SetCursorToEnd(editor, pCursor); + ME_SetCursorToEnd(editor, pCursor, FALSE); editor->bCaretAtEnd = FALSE; }

1 0

Matteo Bruni : wined3d: Use ARB_clip_control to avoid vertex position fixups.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: a5d2b3622b7b4f731075d9cd62c76c64c468666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d2b3622b7b4f731075d9cd6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:56 2016 +0200 wined3d: Use ARB_clip_control to avoid vertex position fixups. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 32 ++++++++++---------- dlls/wined3d/context.c | 15 ++++++++-- dlls/wined3d/directx.c | 17 +++++++++++ dlls/wined3d/glsl_shader.c | 26 +++++++++++----- dlls/wined3d/state.c | 63 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 26 +++++++++------- 6 files changed, 143 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5d2b3622b7b4f731075d…

1 0