wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Nikolay Sivov : dwrite: Report strikethrough ranges to renderer.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: b8e3fbe0c1c9f94bee6d6ec5447a20f565106129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e3fbe0c1c9f94bee6d6ec54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 23:32:30 2015 +0300 dwrite: Report strikethrough ranges to renderer. --- dlls/dwrite/layout.c | 131 +++++++++++++++++++++++++++++++++++---------- dlls/dwrite/tests/layout.c | 25 ++++++++- 2 files changed, 127 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e3fbe0c1c9f94bee6d6…

1 0

Nikolay Sivov : dwrite: Store strikethrough settings in a separate list.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: e31881a6c9f7f01ec4534ae84cae5493901870aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31881a6c9f7f01ec4534ae84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 17:55:26 2015 +0300 dwrite: Store strikethrough settings in a separate list. --- dlls/dwrite/layout.c | 372 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 250 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e31881a6c9f7f01ec4534…

1 0

Nikolay Sivov : dwrite: Added a range data header to distinguish range kinds.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 6d87a451a2942aada61f933b3f9a621589bbbb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d87a451a2942aada61f933b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 13:37:01 2015 +0300 dwrite: Added a range data header to distinguish range kinds. --- dlls/dwrite/layout.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8f42433..1e70cf1 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -93,8 +93,17 @@ struct layout_range_attr_value { } u; }; -struct layout_range { +enum layout_range_kind { + LAYOUT_RANGE_REGULAR +}; + +struct layout_range_header { struct list entry; + enum layout_range_kind kind; +}; + +struct layout_range { + struct layout_range_header h; DWRITE_TEXT_RANGE range; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; @@ -545,7 +554,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (FAILED(hr)) return hr; - LIST_FOR_EACH_ENTRY(range, &layout->ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(range, &layout->ranges, struct layout_range, h.entry) { /* inline objects override actual text in a range */ if (range->object) { hr = layout_update_breakpoints_range(layout, range); @@ -1056,6 +1065,7 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range = heap_alloc(sizeof(*range)); if (!range) return NULL; + range->h.kind = LAYOUT_RANGE_REGULAR; range->range = *r; range->weight = layout->format.weight; range->style = layout->format.style; @@ -1125,8 +1135,8 @@ static void free_layout_range(struct layout_range *range) static void free_layout_ranges_list(struct dwrite_textlayout *layout) { struct layout_range *cur, *cur2; - LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->ranges, struct layout_range, entry) { - list_remove(&cur->entry); + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->ranges, struct layout_range, h.entry) { + list_remove(&cur->h.entry); free_layout_range(cur); } } @@ -1135,7 +1145,7 @@ static struct layout_range *find_outer_range(struct dwrite_textlayout *layout, c { struct layout_range *cur; - LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, h.entry) { if (cur->range.startPosition > range->startPosition) return NULL; @@ -1154,7 +1164,7 @@ static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *la { struct layout_range *cur; - LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, h.entry) { DWRITE_TEXT_RANGE *r = &cur->range; if (r->startPosition <= pos && pos < r->startPosition + r->length) return cur; @@ -1279,7 +1289,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo if (!left) return E_OUTOFMEMORY; changed = set_layout_range_attrval(left, attr, value); - list_add_before(&outer->entry, &left->entry); + list_add_before(&outer->h.entry, &left->h.entry); outer->range.startPosition += value->range.length; outer->range.length -= value->range.length; goto done; @@ -1291,7 +1301,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo if (!right) return E_OUTOFMEMORY; changed = set_layout_range_attrval(right, attr, value); - list_add_after(&outer->entry, &right->entry); + list_add_after(&outer->h.entry, &right->h.entry); outer->range.length -= value->range.length; goto done; } @@ -1315,8 +1325,8 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo /* new part */ set_layout_range_attrval(cur, attr, value); - list_add_after(&outer->entry, &cur->entry); - list_add_after(&cur->entry, &right->entry); + list_add_after(&outer->h.entry, &cur->h.entry); + list_add_after(&cur->h.entry, &right->h.entry); return S_OK; } @@ -1332,14 +1342,14 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo left->range.length -= r.length; cur = alloc_layout_range_from(left, &r); changed = set_layout_range_attrval(cur, attr, value); - list_add_after(&left->entry, &cur->entry); + list_add_after(&left->h.entry, &cur->h.entry); } - cur = LIST_ENTRY(list_next(ranges, &left->entry), struct layout_range, entry); + cur = LIST_ENTRY(list_next(ranges, &left->h.entry), struct layout_range, h.entry); /* for all existing ranges covered by new one update value */ while (is_in_layout_range(&value->range, &cur->range)) { changed = set_layout_range_attrval(cur, attr, value); - cur = LIST_ENTRY(list_next(ranges, &cur->entry), struct layout_range, entry); + cur = LIST_ENTRY(list_next(ranges, &cur->h.entry), struct layout_range, h.entry); } /* it's possible rightmost range intersects */ @@ -1350,7 +1360,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo changed = set_layout_range_attrval(left, attr, value); cur->range.startPosition += left->range.length; cur->range.length -= left->range.length; - list_add_before(&cur->entry, &left->entry); + list_add_before(&cur->h.entry, &left->h.entry); } done: @@ -1360,9 +1370,9 @@ done: layout->recompute = RECOMPUTE_EVERYTHING; i = list_head(ranges); while ((next = list_next(ranges, i))) { - struct layout_range *next_range = LIST_ENTRY(next, struct layout_range, entry); + struct layout_range *next_range = LIST_ENTRY(next, struct layout_range, h.entry); - cur = LIST_ENTRY(i, struct layout_range, entry); + cur = LIST_ENTRY(i, struct layout_range, h.entry); if (is_same_layout_attributes(cur, next_range)) { /* remove similar range */ cur->range.length += next_range->range.length; @@ -3098,7 +3108,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * goto fail; } - list_add_head(&layout->ranges, &range->entry); + list_add_head(&layout->ranges, &range->h.entry); return S_OK; fail:

1 0

Nikolay Sivov : dwrite/tests: Test actual strings being reported to a renderer.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 72dcc4d437d7bc4c3bdef9eee1acc2dfb45487b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72dcc4d437d7bc4c3bdef9eee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 12:32:38 2015 +0300 dwrite/tests: Test actual strings being reported to a renderer. --- dlls/dwrite/tests/layout.c | 66 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 77fa85c..472e01f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -231,6 +231,7 @@ static const char *get_draw_kind_name(enum drawcall_kind kind) struct drawcall_entry { enum drawcall_kind kind; + WCHAR string[10]; /* only meaningful for DrawGlyphRun() */ }; struct drawcall_sequence @@ -326,6 +327,18 @@ static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, ok_(file, line) (0, "%s: call %s was expected, but got call %s instead\n", context, get_draw_kind_name(expected->kind), get_draw_kind_name(actual->kind)); } + else if (expected->kind == DRAW_GLYPHRUN) { + int cmp = lstrcmpW(expected->string, actual->string); + if (cmp != 0 && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: glyphrun string %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->string), wine_dbgstr_w(actual->string)); + } + else + ok_(file, line) (cmp == 0, "%s: glyphrun string %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->string), wine_dbgstr_w(actual->string)); + } expected++; actual++; } @@ -421,6 +434,14 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, struct drawcall_entry entry; DWRITE_SCRIPT_ANALYSIS sa; + ok(descr->stringLength < sizeof(entry.string)/sizeof(WCHAR), "string is too long\n"); + if (descr->stringLength && descr->stringLength < sizeof(entry.string)/sizeof(WCHAR)) { + memcpy(entry.string, descr->string, descr->stringLength*sizeof(WCHAR)); + entry.string[descr->stringLength] = 0; + } + else + entry.string[0] = 0; + /* see what's reported for control codes runs */ get_script_analysis(descr->string, descr->stringLength, &sa); if (sa.script == g_control_sa.script) { @@ -1102,10 +1123,10 @@ static void test_SetInlineObject(void) /* drawing calls sequence doesn't depend on run order, instead all runs are drawn first, inline objects next and then underline/strikes */ static const struct drawcall_entry draw_seq[] = { - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN, {'s',0} }, + { DRAW_GLYPHRUN, {'r','i',0} }, + { DRAW_GLYPHRUN, {'n',0} }, + { DRAW_GLYPHRUN, {'g',0} }, { DRAW_INLINE }, { DRAW_UNDERLINE }, { DRAW_STRIKETHROUGH }, @@ -1113,18 +1134,25 @@ static const struct drawcall_entry draw_seq[] = { }; static const struct drawcall_entry draw_seq2[] = { - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN, {'s',0} }, + { DRAW_GLYPHRUN, {'t',0} }, + { DRAW_GLYPHRUN, {'r',0} }, + { DRAW_GLYPHRUN, {'i',0} }, + { DRAW_GLYPHRUN, {'n',0} }, + { DRAW_GLYPHRUN, {'g',0} }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_seq3[] = { { DRAW_GLYPHRUN }, - { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN, {'a','b',0} }, + { DRAW_LAST_KIND } +}; + +static const struct drawcall_entry draw_seq4[] = { + { DRAW_GLYPHRUN, {'s','t','r',0} }, + { DRAW_GLYPHRUN, {'i','n','g',0} }, + { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } }; @@ -1197,6 +1225,22 @@ static void test_Draw(void) ok_sequence(sequences, RENDERER_ID, draw_seq3, "draw test 3", TRUE); IDWriteTextLayout_Release(layout); + /* strikethrough splits ranges from renderer point of view, but doesn't break + shaping */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + + range.startPosition = 0; + range.length = 3; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_seq4, "draw test 4", TRUE); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : ole32/tests: Test if user memory routines are called, remove some useless traces.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: ff6201c61fde8c08b3eb8cf5217064a6779749a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6201c61fde8c08b3eb8cf52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 10:34:43 2015 +0300 ole32/tests: Test if user memory routines are called, remove some useless traces. --- dlls/ole32/tests/usrmarshal.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 51ccc59..83dedc7 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -44,13 +44,17 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal (ULONG *, unsigned char *, unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *); void __RPC_USER HMETAFILEPICT_UserFree(ULONG *, HMETAFILEPICT *); +static BOOL g_expect_user_alloc; static void * WINAPI user_allocate(SIZE_T size) { + ok(g_expect_user_alloc, "unexpected user_allocate call\n"); return CoTaskMemAlloc(size); } +static BOOL g_expect_user_free; static void WINAPI user_free(void *p) { + ok(g_expect_user_free, "unexpected user_free call\n"); CoTaskMemFree(p); } @@ -201,7 +205,6 @@ static void test_marshal_HGLOBAL(void) GlobalUnlock(hglobal); actual_size = GlobalSize(hglobal); expected_size = actual_size + 5 * sizeof(DWORD); - trace("%d: actual size %d\n", block_size, actual_size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); /* native is poorly programmed and allocates 4/8 bytes more than it needs to @@ -404,7 +407,6 @@ static void test_marshal_HMETAFILEPICT(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = HMETAFILEPICT_UserSize(&umcb.Flags, 0, &hmfp); ok(size > 20, "size should be at least 20 bytes, not %d\n", size); - trace("size is %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); buffer_end = HMETAFILEPICT_UserMarshal(&umcb.Flags, buffer, &hmfp); @@ -604,14 +606,12 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) IStream_Seek(stm, zero, STREAM_SEEK_CUR, &pos); marshal_size = pos.u.LowPart; marshal_data = GlobalLock(h); - trace("marshal_size %x\n", marshal_size); todo_wine ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); ok(size >= marshal_size + 2 * sizeof(DWORD), "marshal size %x got %x\n", marshal_size, size); - trace("WdtpInterfacePointer_UserSize returned %x\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); @@ -846,8 +846,10 @@ static void test_marshal_SNB(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + g_expect_user_alloc = TRUE; snb2 = NULL; SNB_UserUnmarshal(&umcb.Flags, buffer, &snb2); + g_expect_user_alloc = FALSE; ptrW = snb2; ok(!lstrcmpW(*ptrW, str1W), "unmarshalled string 0: %s\n", wine_dbgstr_w(*ptrW)); @@ -858,7 +860,10 @@ static void test_marshal_SNB(void) HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + + g_expect_user_free = TRUE; SNB_UserFree(&umcb.Flags, &snb2); + g_expect_user_free = FALSE; } START_TEST(usrmarshal)

1 0

Alexandre Julliard : user32: Disallow format 0 in SetClipboardData.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 0aa1af219fd01253fda1724fc1c009e5aba9fa32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa1af219fd01253fda1724fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 17:30:28 2015 +0900 user32: Disallow format 0 in SetClipboardData. --- dlls/user32/clipboard.c | 6 ++++++ dlls/user32/tests/clipboard.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index cd3fdd75..ae6b887 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -400,6 +400,12 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) TRACE("(%04X, %p) !\n", wFormat, hData); + if (!wFormat) + { + SetLastError( ERROR_CLIPBOARD_NOT_OPEN ); + return 0; + } + /* If it's not owned, data can only be set if the format isn't available and its rendering is not delayed */ if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index e3ca808..25da45b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -111,6 +111,7 @@ static void test_RegisterClipboardFormatA(void) char buf[256]; int len; BOOL ret; + HANDLE handle; format_id = RegisterClipboardFormatA("my_cool_clipboard_format"); ok(format_id > 0xc000 && format_id < 0xffff, "invalid clipboard format id %04x\n", format_id); @@ -165,6 +166,25 @@ todo_wine ret = OpenClipboard(0); ok( ret, "OpenClipboard error %d\n", GetLastError()); + /* try some invalid/unregistered formats */ + SetLastError( 0xdeadbeef ); + handle = SetClipboardData( 0, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( !handle, "SetClipboardData succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError()); + handle = SetClipboardData( 0x1234, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( handle != 0, "SetClipboardData failed err %d\n", GetLastError()); + handle = SetClipboardData( 0x123456, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( handle != 0, "SetClipboardData failed err %d\n", GetLastError()); + handle = SetClipboardData( 0xffff8765, GlobalAlloc( GMEM_DDESHARE | GMEM_MOVEABLE, 1 )); + ok( handle != 0, "SetClipboardData failed err %d\n", GetLastError()); + + ok( IsClipboardFormatAvailable( 0x1234 ), "format missing\n" ); + ok( IsClipboardFormatAvailable( 0x123456 ), "format missing\n" ); + ok( IsClipboardFormatAvailable( 0xffff8765 ), "format missing\n" ); + ok( !IsClipboardFormatAvailable( 0 ), "format available\n" ); + ok( !IsClipboardFormatAvailable( 0x3456 ), "format available\n" ); + ok( !IsClipboardFormatAvailable( 0x8765 ), "format available\n" ); + trace("# of formats available: %d\n", CountClipboardFormats()); format_id = 0;

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for fog parameters.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 614e52e89746b34826fb17c98b1b2ffc6bcbd9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=614e52e89746b34826fb17c98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 00:37:33 2015 +0200 wined3d: Don't use the builtin FFP uniforms for fog parameters. --- dlls/wined3d/glsl_shader.c | 81 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 19 +++++----- 2 files changed, 81 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=614e52e89746b34826fb1…

1 0

Matteo Bruni : wined3d: Introduce a get_fog_start_end() function.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: b02a166cc84a1c61db9e91e26e6b8e0a8662fd19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02a166cc84a1c61db9e91e26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 00:37:32 2015 +0200 wined3d: Introduce a get_fog_start_end() function. --- dlls/wined3d/state.c | 41 +------------------------------------- dlls/wined3d/utils.c | 45 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 917d155..b7d7f92 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1006,47 +1006,8 @@ void state_fogstartend(struct wined3d_context *context, const struct wined3d_sta { const struct wined3d_gl_info *gl_info = context->gl_info; float fogstart, fogend; - union { - DWORD d; - float f; - } tmpvalue; - - switch(context->fog_source) { - case FOGSOURCE_VS: - fogstart = 1.0f; - fogend = 0.0f; - break; - - case FOGSOURCE_COORD: - fogstart = 255.0f; - fogend = 0.0f; - break; - case FOGSOURCE_FFP: - tmpvalue.d = state->render_states[WINED3D_RS_FOGSTART]; - fogstart = tmpvalue.f; - tmpvalue.d = state->render_states[WINED3D_RS_FOGEND]; - fogend = tmpvalue.f; - /* Special handling for fogstart == fogend. In d3d with vertex - * fog, everything is fogged. With table fog, everything with - * fog_coord < fog_start is unfogged, and fog_coord > fog_start - * is fogged. Windows drivers disagree when fog_coord == fog_start. */ - if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE - && fogstart == fogend) - { - fogstart = -INFINITY; - fogend = 0.0f; - } - break; - - default: - /* This should not happen.context->fog_source is set in wined3d, not the app. - * Still this is needed to make the compiler happy - */ - ERR("Unexpected fog coordinate source\n"); - fogstart = 0.0f; - fogend = 0.0f; - } + get_fog_start_end(context, state, &fogstart, &fogend); gl_info->gl_ops.gl.p_glFogf(GL_FOG_START, fogstart); checkGLcall("glFogf(GL_FOG_START, fogstart)"); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2a4ac83..ed4262a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3654,6 +3654,51 @@ void get_pointsize(const struct wined3d_context *context, const struct wined3d_s *out_pointsize = pointsize.f; } +void get_fog_start_end(const struct wined3d_context *context, const struct wined3d_state *state, + float *start, float *end) +{ + union + { + DWORD d; + float f; + } tmpvalue; + + switch (context->fog_source) + { + case FOGSOURCE_VS: + *start = 1.0f; + *end = 0.0f; + break; + + case FOGSOURCE_COORD: + *start = 255.0f; + *end = 0.0f; + break; + + case FOGSOURCE_FFP: + tmpvalue.d = state->render_states[WINED3D_RS_FOGSTART]; + *start = tmpvalue.f; + tmpvalue.d = state->render_states[WINED3D_RS_FOGEND]; + *end = tmpvalue.f; + /* Special handling for fog_start == fog_end. In d3d with vertex + * fog, everything is fogged. With table fog, everything with + * fog_coord < fog_start is unfogged, and fog_coord > fog_start + * is fogged. Windows drivers disagree when fog_coord == fog_start. */ + if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE && *start == *end) + { + *start = -INFINITY; + *end = 0.0f; + } + break; + + default: + /* This should not happen, context->fog_source is set in wined3d, not the app. */ + ERR("Unexpected fog coordinate source.\n"); + *start = 0.0f; + *end = 0.0f; + } +} + /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9de679..93cfd9e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3074,6 +3074,8 @@ void get_pointsize_minmax(const struct wined3d_context *context, const struct wi float *out_min, float *out_max) DECLSPEC_HIDDEN; void get_pointsize(const struct wined3d_context *context, const struct wined3d_state *state, float *out_pointsize, float *out_att) DECLSPEC_HIDDEN; +void get_fog_start_end(const struct wined3d_context *context, const struct wined3d_state *state, + float *start, float *end) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : d3d8/tests: Port the point size test to D3D8.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 53ff3279e4db958a3c3c7e47d91ccbd5f0a5e126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ff3279e4db958a3c3c7e47d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 01:21:10 2015 +0200 d3d8/tests: Port the point size test to D3D8. --- dlls/d3d8/tests/visual.c | 511 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 511 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53ff3279e4db958a3c3c7…

1 0

Matteo Bruni : d3d9/tests: Add more tests for point size.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 386b5ded61a023e1343fd56be781057c6ebc4236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=386b5ded61a023e1343fd56be… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 01:21:09 2015 +0200 d3d9/tests: Add more tests for point size. --- dlls/d3d9/tests/visual.c | 361 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 326 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=386b5ded61a023e1343fd…

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015