August 2014 - Wine-Commits - list.winehq.org

André Hentschel : wpcap: Implement pcap_freecode.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 03d067183f2789a215406b53e426c7ad5a4d8b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d067183f2789a215406b53e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:53:51 2014 +0200 wpcap: Implement pcap_freecode. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 4eedbd8..f5402a4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -55,6 +55,12 @@ void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) pcap_freealldevs(alldevs); } +void CDECL wine_pcap_freecode(struct bpf_program *fp) +{ + TRACE("(%p)\n", fp); + return pcap_freecode(fp); +} + char* CDECL wine_pcap_geterr(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index c0ba15e..2af9197 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -27,7 +27,7 @@ @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs -@ stub pcap_freecode +@ cdecl pcap_freecode(ptr) wine_pcap_freecode @ stub pcap_get_airpcap_handle @ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent

1 0

André Hentschel : wpcap: Fix spec file to not print empty buffers.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: d1e780f2d2dc7b2f64e1dae264676e2c63725760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e780f2d2dc7b2f64e1dae26… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:52:27 2014 +0200 wpcap: Fix spec file to not print empty buffers. --- dlls/wpcap/wpcap.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 75a5bfd..c0ba15e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -24,7 +24,7 @@ @ stub pcap_dump_open @ stub pcap_file @ stub pcap_fileno -@ cdecl pcap_findalldevs(ptr str) wine_pcap_findalldevs +@ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ stub pcap_freecode @@ -37,8 +37,8 @@ @ stub pcap_list_datalinks @ stub pcap_live_dump @ stub pcap_live_dump_ended -@ cdecl pcap_lookupdev(str) wine_pcap_lookupdev -@ cdecl pcap_lookupnet(str ptr ptr str) wine_pcap_lookupnet +@ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev +@ cdecl pcap_lookupnet(str ptr ptr ptr) wine_pcap_lookupnet @ stub pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @@ -49,7 +49,7 @@ @ stub pcap_offline_read @ stub pcap_open @ stub pcap_open_dead -@ cdecl pcap_open_live(str long long long str) wine_pcap_open_live +@ cdecl pcap_open_live(str long long long ptr) wine_pcap_open_live @ stub pcap_open_offline @ stub pcap_parsesrcstr @ stub pcap_perror

1 0

Bernhard Reiter : imagehlp/tests: Add test for BindImageEx with NULL as StatusRoutine.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 0b2e7de7b48554698c3c757356da9362b3c3cdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2e7de7b48554698c3c75735… Author: Bernhard Reiter <ockham(a)raz.or.at> Date: Sat Aug 16 21:31:44 2014 +0200 imagehlp/tests: Add test for BindImageEx with NULL as StatusRoutine. --- dlls/imagehlp/tests/image.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 1f1862b..48443f5 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -405,7 +405,12 @@ static void test_bind_image_ex(void) WriteFile(file, &bin, sizeof(bin), &count, NULL); CloseHandle(file); - /* call with a proper PE file */ + /* call with a proper PE file, but with StatusRoutine set to NULL */ + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, + NULL); + ok(ret, "BindImageEx failed: %d\n", GetLastError()); + + /* call with a proper PE file and StatusRoutine */ ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, testing_status_routine); ok(ret, "BindImageEx failed: %d\n", GetLastError());

1 0

Nikolay Sivov : oleaut32/tests: Remove redundant assignment (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: baa8363f90a096e53f84f33359def4e38ce44ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa8363f90a096e53f84f3335… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:01:02 2014 +0400 oleaut32/tests: Remove redundant assignment (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 5e0d66a..804fb76 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2332,7 +2332,6 @@ static void test_VarNot(void) VARNOT(BSTR, (BSTR)szTrue, BOOL, VARIANT_FALSE); VARNOT(BSTR, (BSTR)szFalse, BOOL, VARIANT_TRUE); - V_VT(&v) = VT_DECIMAL; S(U(*pdec)).sign = DECIMAL_NEG; S(U(*pdec)).scale = 0; pdec->Hi32 = 0;

1 0

Nikolay Sivov : urlmon: Remove duplicated check (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: f7322187fe6876b20be4cc20d9224c7e04dde94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7322187fe6876b20be4cc20d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 14:00:21 2014 +0400 urlmon: Remove duplicated check (PVS-Studio). --- dlls/urlmon/sec_mgr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 5c145ae..e1c7ec8 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -241,11 +241,9 @@ static BOOL matches_domain_pattern(LPCWSTR pattern, LPCWSTR str, BOOL implicit_w * * Doesn't match the pattern. */ - if(str_len > pattern_len) { - if(str[str_len-pattern_len-1] == '.' && !strcmpiW(str+(str_len-pattern_len), pattern)) { - matches = TRUE; - *matched = str+(str_len-pattern_len); - } + if(str[str_len-pattern_len-1] == '.' && !strcmpiW(str+(str_len-pattern_len), pattern)) { + matches = TRUE; + *matched = str+(str_len-pattern_len); } } else { /* The pattern doesn't have an implicit wildcard, or an explicit wildcard,

1 0

Nikolay Sivov : dwrite: Implement ranges merging.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: baedef728c325125f8617508a256a94a3cabc767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baedef728c325125f8617508a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 15 07:10:58 2014 +0400 dwrite: Implement ranges merging. --- dlls/dwrite/layout.c | 55 +++++++++++++++++++++++++++++++++++----------- dlls/dwrite/tests/layout.c | 28 +++++++++++++++++++---- 2 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1ed0a87..aed6652 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -155,7 +155,7 @@ static inline BOOL validate_text_range(struct dwrite_textlayout *layout, DWRITE_ return TRUE; } -static BOOL is_same_layout_range(struct layout_range const *range, enum layout_range_attr_kind attr, struct layout_range_attr_value *value) +static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layout_range_attr_kind attr, struct layout_range_attr_value *value) { switch (attr) { case LAYOUT_RANGE_ATTR_WEIGHT: @@ -177,6 +177,16 @@ static BOOL is_same_layout_range(struct layout_range const *range, enum layout_r return FALSE; } +static inline BOOL is_same_layout_attributes(struct layout_range const *left, struct layout_range const *right) +{ + return left->weight == right->weight && + left->style == right->style && + left->object == right->object && + left->effect == right->effect && + left->underline == right->underline && + left->strikethrough == right->strikethrough; +} + static inline BOOL is_same_text_range(const DWRITE_TEXT_RANGE *left, const DWRITE_TEXT_RANGE *right) { return left->startPosition == right->startPosition && left->length == right->length; @@ -325,19 +335,20 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo { struct layout_range *outer, *right, *left, *cur; struct list *ranges = &layout->ranges; + BOOL changed = FALSE; DWRITE_TEXT_RANGE r; /* If new range is completely within existing range, split existing range in two */ if ((outer = find_outer_range(ranges, &value->range))) { /* no need to add same range */ - if (is_same_layout_range(outer, attr, value)) + if (is_same_layout_attrvalue(outer, attr, value)) return S_OK; /* for matching range bounds just replace data */ if (is_same_text_range(&outer->range, &value->range)) { - set_layout_range_attrval(outer, attr, value); - return S_OK; + changed = set_layout_range_attrval(outer, attr, value); + goto done; } /* add new range to the left */ @@ -345,11 +356,11 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo left = alloc_layout_range_from(outer, &value->range); if (!left) return E_OUTOFMEMORY; - set_layout_range_attrval(left, attr, value); + changed = set_layout_range_attrval(left, attr, value); list_add_before(&outer->entry, &left->entry); outer->range.startPosition += value->range.length; outer->range.length -= value->range.length; - return S_OK; + goto done; } /* add new range to the right */ @@ -357,10 +368,10 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo right = alloc_layout_range_from(outer, &value->range); if (!right) return E_OUTOFMEMORY; - set_layout_range_attrval(right, attr, value); + changed = set_layout_range_attrval(right, attr, value); list_add_after(&outer->entry, &right->entry); outer->range.length -= value->range.length; - return S_OK; + goto done; } r.startPosition = value->range.startPosition + value->range.length; @@ -392,20 +403,20 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo Update all of them. */ left = get_layout_range_by_pos(ranges, value->range.startPosition); if (left->range.startPosition == value->range.startPosition) - set_layout_range_attrval(left, attr, value); + changed = set_layout_range_attrval(left, attr, value); else /* need to split */ { r.startPosition = value->range.startPosition; r.length = left->range.length - value->range.startPosition + left->range.startPosition; left->range.length -= r.length; cur = alloc_layout_range_from(left, &r); - set_layout_range_attrval(cur, attr, value); + changed = set_layout_range_attrval(cur, attr, value); list_add_after(&left->entry, &cur->entry); } cur = LIST_ENTRY(list_next(ranges, &left->entry), struct layout_range, entry); /* for all existing ranges covered by new one update value */ while (is_in_layout_range(&value->range, &cur->range)) { - set_layout_range_attrval(cur, attr, value); + changed = set_layout_range_attrval(cur, attr, value); cur = LIST_ENTRY(list_next(ranges, &cur->entry), struct layout_range, entry); } @@ -414,13 +425,31 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo r.startPosition = cur->range.startPosition; r.length = value->range.startPosition + value->range.length - cur->range.startPosition; left = alloc_layout_range_from(cur, &r); - set_layout_range_attrval(left, attr, value); + 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); } - /* TODO: compact adjacent ranges if needed */ +done: + if (changed) { + struct list *next, *i; + + i = list_head(ranges); + while ((next = list_next(ranges, i))) { + struct layout_range *next_range = LIST_ENTRY(next, struct layout_range, entry); + + cur = LIST_ENTRY(i, struct layout_range, entry); + if (is_same_layout_attributes(cur, next_range)) { + /* remove similar range */ + cur->range.length += next_range->range.length; + list_remove(next); + free_layout_range(next_range); + } + else + i = list_next(ranges, i); + } + } return S_OK; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 336cc0b..236c34b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -591,7 +591,7 @@ static void test_SetInlineObject(void) IDWriteInlineObject *inlineobj, *inlineobj2, *inlinetest; IDWriteTextFormat *format; IDWriteTextLayout *layout; - DWRITE_TEXT_RANGE range; + DWRITE_TEXT_RANGE range, r2; HRESULT hr; hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, @@ -623,9 +623,11 @@ static void test_SetInlineObject(void) ok(inlinetest == NULL, "got %p\n", inlinetest); inlinetest = NULL; - hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); range.startPosition = 1; @@ -634,15 +636,19 @@ static void test_SetInlineObject(void) ok(hr == S_OK, "got 0x%08x\n", hr); inlinetest = NULL; - hr = IDWriteTextLayout_GetInlineObject(layout, 1, &inlinetest, NULL); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 1, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(inlinetest == inlineobj2, "got %p\n", inlinetest); + ok(r2.startPosition == 1 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); inlinetest = NULL; - hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); range.startPosition = 1; @@ -650,11 +656,25 @@ static void test_SetInlineObject(void) hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); + IDWriteInlineObject_Release(inlinetest); + range.startPosition = 1; range.length = 2; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 3, "got %d, %d\n", r2.startPosition, r2.length); + IDWriteInlineObject_Release(inlinetest); + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); }

1 0

André Hentschel : shlwapi/tests: Fix SHFormatDateTimeW tests for right-to-left locales.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: badfdaf56c446cb37305e9df101cb1d9411afe0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=badfdaf56c446cb37305e9df1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 19:25:29 2014 +0200 shlwapi/tests: Fix SHFormatDateTimeW tests for right-to-left locales. --- dlls/shlwapi/tests/ordinal.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 531844f..cb90d31 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1794,6 +1794,7 @@ static void test_SHFormatDateTimeW(void) INT ret; static const WCHAR spaceW[] = {' ',0}; #define UNICODE_LTR_MARK 0x200e +#define UNICODE_RTL_MARK 0x200f if(!pSHFormatDateTimeW) { @@ -1923,9 +1924,9 @@ if (0) p2 = buff2; while (*p2 != '\0') { - while (*p1 == UNICODE_LTR_MARK) + while (*p1 == UNICODE_LTR_MARK || *p1 == UNICODE_RTL_MARK) p1++; - while (*p2 == UNICODE_LTR_MARK) + while (*p2 == UNICODE_LTR_MARK || *p2 == UNICODE_RTL_MARK) p2++; p1++; p2++; @@ -1949,9 +1950,9 @@ if (0) p2 = buff2; while (*p2 != '\0') { - while (*p1 == UNICODE_LTR_MARK) + while (*p1 == UNICODE_LTR_MARK || *p1 == UNICODE_RTL_MARK) p1++; - while (*p2 == UNICODE_LTR_MARK) + while (*p2 == UNICODE_LTR_MARK || *p2 == UNICODE_RTL_MARK) p2++; p1++; p2++;

1 0

Jacek Caban : d3d10_1.idl: Added some missing constants.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 9e942d29509b5a4a455ea79c421b65135b1fd919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e942d29509b5a4a455ea79c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 15 18:18:56 2014 +0200 d3d10_1.idl: Added some missing constants. --- include/d3d10_1.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index bfae754..d0e02d4 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -19,6 +19,29 @@ import "oaidl.idl"; import "ocidl.idl"; +const UINT D3D10_1_DEFAULT_SAMPLE_MASK = 0xffffffff; +const UINT D3D10_1_GS_INPUT_REGISTER_COUNT = 32; +const UINT D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS = 128; +const UINT D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT = 32; +const UINT D3D10_1_PS_OUTPUT_MASK_REGISTER_COMPONENTS = 1; +const UINT D3D10_1_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D10_1_PS_OUTPUT_MASK_REGISTER_COUNT = 1; +const UINT D3D10_1_SHADER_MAJOR_VERSION = 4; +const UINT D3D10_1_SHADER_MINOR_VERSION = 1; +const UINT D3D10_1_SO_BUFFER_MAX_STRIDE_IN_BYTES = 2048; +const UINT D3D10_1_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES = 256; +const UINT D3D10_1_SO_BUFFER_SLOT_COUNT = 4; +const UINT D3D10_1_SO_MULTIPLE_BUFFER_ELEMENTS_PER_BUFFER = 1; +const UINT D3D10_1_SO_SINGLE_BUFFER_COMPONENT_LIMIT = 64; +const UINT D3D10_1_STANDARD_VERTEX_ELEMENT_COUNT = 32; +const UINT D3D10_1_SUBPIXEL_FRACTIONAL_BIT_COUNT = 8; +const UINT D3D10_1_VS_INPUT_REGISTER_COUNT = 32; +const UINT D3D10_1_VS_OUTPUT_REGISTER_COUNT = 32; + +cpp_quote("#define D3D10_1_FLOAT16_FUSED_TOLERANCE_IN_ULP (0.6)") +cpp_quote("#define D3D10_1_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP (0.6f)") + import "d3d10.idl"; cpp_quote("#include <d3d10_1shader.h>")

1 0

Jacek Caban : d3d11.idl: Added some missing declarations.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: b5381dd772f2528965161e50e812870f1f710b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5381dd772f2528965161e50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 15 18:19:09 2014 +0200 d3d11.idl: Added some missing declarations. --- include/d3d11.idl | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index e88ae7f..4e883f7 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -27,6 +27,42 @@ typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY; typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION; typedef RECT D3D11_RECT; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT = 14; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT = 15; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_PARTIAL_UPDATE_EXTENTS_BYTE_ALIGNMENT = 16; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT = 15; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT = 64; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT = 1; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS = 1; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT = 128; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT = 128; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS = 1; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT = 16; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST = 1; +const UINT D3D11_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS = 1; +const UINT D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT = 16; +const UINT D3D11_COMMONSHADER_SUBROUTINE_NESTING_LIMIT = 32; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENTS = 4; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_COUNT = 4096; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_READS_PER_INST = 3; +const UINT D3D11_COMMONSHADER_TEMP_REGISTER_READ_PORTS = 3; +const UINT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX = 10; +const INT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN = -10; +const INT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE = -8; +const UINT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE = 7; + const UINT D3D11_DEFAULT_DEPTH_BIAS = 0; cpp_quote("#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f") const UINT D3D11_DEFAULT_MAX_ANISOTROPY = 16; @@ -66,6 +102,80 @@ const UINT D3D11_SHADER_MAX_TYPES = 65535; const UINT D3D11_SHADER_MINOR_VERSION = 0; const UINT D3D11_VS_OUTPUT_REGISTER_COUNT = 32; +const UINT D3D11_PS_CS_UAV_REGISTER_COMPONENTS = 1; +const UINT D3D11_PS_CS_UAV_REGISTER_COUNT = 8; +const UINT D3D11_PS_CS_UAV_REGISTER_READS_PER_INST = 1; +const UINT D3D11_PS_CS_UAV_REGISTER_READ_PORTS = 1; +const UINT D3D11_PS_FRONTFACING_DEFAULT_VALUE = 0xffffffff; +const UINT D3D11_PS_FRONTFACING_FALSE_VALUE = 0; +const UINT D3D11_PS_FRONTFACING_TRUE_VALUE = 0xffffffff; +const UINT D3D11_PS_INPUT_REGISTER_COMPONENTS = 4; +const UINT D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_INPUT_REGISTER_COUNT = 32; +const UINT D3D11_PS_INPUT_REGISTER_READS_PER_INST = 2; +const UINT D3D11_PS_INPUT_REGISTER_READ_PORTS = 1; +cpp_quote("#define D3D11_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT (0.0f)") +const UINT D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS = 1; +const UINT D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_OUTPUT_DEPTH_REGISTER_COUNT = 1; +const UINT D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENTS = 1; +const UINT D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_OUTPUT_MASK_REGISTER_COUNT = 1; +const UINT D3D11_PS_OUTPUT_REGISTER_COMPONENTS = 4; +const UINT D3D11_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_PS_OUTPUT_REGISTER_COUNT = 8; +cpp_quote("#define D3D11_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT (0.5f)") + +const UINT D3D11_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; + +const UINT D3D11_REQ_BLEND_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP = 27; +const UINT D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; +const UINT D3D11_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP = 32; +const UINT D3D11_REQ_DRAW_VERTEX_COUNT_2_TO_EXP = 32; +const UINT D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION = 16384; +const UINT D3D11_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT = 1024; +const UINT D3D11_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; +const UINT D3D11_REQ_MAXANISOTROPY = 16; +const UINT D3D11_REQ_MIP_LEVELS = 15; +const UINT D3D11_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES = 2048; +const UINT D3D11_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH = 16384; +const UINT D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM = 128; +cpp_quote("#define D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM (0.25f)") +const UINT D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_C_TERM = 2048; +const UINT D3D11_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP = 20; +const UINT D3D11_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE = 4096; +const UINT D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION = 2048; +const UINT D3D11_REQ_TEXTURE1D_U_DIMENSION = 16384; +const UINT D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION = 2048; +const UINT D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION = 16384; +const UINT D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION = 2048; +const UINT D3D11_REQ_TEXTURECUBE_DIMENSION = 16384; + +const UINT D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL = 0; + +const UINT D3D11_SHADER_MAJOR_VERSION = 5; +const UINT D3D11_SHADER_MAX_INSTANCES = 65535; +const UINT D3D11_SHADER_MAX_INTERFACES = 253; +const UINT D3D11_SHADER_MAX_INTERFACE_CALL_SITES = 4096; +const UINT D3D11_SHADER_MAX_TYPES = 65535; +const UINT D3D11_SHADER_MINOR_VERSION = 0; + +const UINT D3D11_SHIFT_INSTRUCTION_PAD_VALUE = 0; +const UINT D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT = 5; + +const UINT D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; + +const UINT D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES = 2048; +const UINT D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES = 512; +const UINT D3D11_SO_BUFFER_SLOT_COUNT = 4; +const UINT D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP = 0xffffffff; +const UINT D3D11_SO_NO_RASTERIZED_STREAM = 0xffffffff; +const UINT D3D11_SO_OUTPUT_COMPONENT_COUNT = 128; +const UINT D3D11_SO_STREAM_COUNT = 4; + cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") cpp_quote("struct CD3D11_DEFAULT {};") cpp_quote("extern const DECLSPEC_SELECTANY CD3D11_DEFAULT D3D11_DEFAULT;") @@ -343,6 +453,17 @@ typedef enum D3D11_MAP D3D11_MAP_WRITE_NO_OVERWRITE } D3D11_MAP; +typedef enum D3D11_MAP_FLAG +{ + D3D11_MAP_FLAG_DO_NOT_WAIT = 0x00100000 +} D3D11_MAP_FLAG; + +typedef struct D3D11_QUERY_DATA_SO_STATISTICS +{ + UINT64 NumPrimitivesWritten; + UINT64 PrimitivesStorageNeeded; +} D3D11_QUERY_DATA_SO_STATISTICS; + typedef struct D3D11_MAPPED_SUBRESOURCE { void *pData;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 59ac973d84516fc079f5eef05ae10b26d76fe55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ac973d84516fc079f5eef05… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Aug 15 19:13:23 2014 +0300 po: Update Finnish translation. --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5ffc43c..9ce1e19 100644 --- a/po/fi.po +++ b/po/fi.po @@ -845,7 +845,7 @@ msgstr "Tiedostoa ei ole" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "Valinta sisältää kohteen, joka ei ole kansio" #: comdlg32.rc:45 msgid "Up One Level" @@ -1036,10 +1036,8 @@ msgid "Open File" msgstr "Avaa tiedosto" #: comdlg32.rc:147 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "Uusi kansio" +msgstr "Valitse kansio" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0