May 2016 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Make spacing consistent between DrawCaptionTemp and NC_DrawCaption.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 5fdcacad0ad73195cd52250a23f3b489f16a7a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fdcacad0ad73195cd52250a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 22:12:08 2016 +0900 user32: Make spacing consistent between DrawCaptionTemp and NC_DrawCaption. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index d3598b1..3352e46 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -312,12 +312,13 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, if (!hIcon) hIcon = NC_IconForWindow(hwnd); DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); - rc.left += (rc.bottom - rc.top); + rc.left = pt.x + GetSystemMetrics( SM_CXSMICON ); } /* drawing text */ if (uFlags & DC_TEXT) { HFONT hOldFont; + WCHAR text[128]; if (uFlags & DC_INBUTTON) SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT)); @@ -340,16 +341,14 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, hOldFont = SelectObject (hdc, hNewFont); } - if (str) - DrawTextW (hdc, str, -1, &rc, - DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT); - else { - WCHAR szText[128]; - INT nLen; - nLen = GetWindowTextW (hwnd, szText, 128); - DrawTextW (hdc, szText, nLen, &rc, - DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT); + if (!str) + { + if (!GetWindowTextW( hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + str = text; } + rc.left += 2; + DrawTextW( hdc, str, -1, &rc, ((uFlags & 0x4000) ? DT_CENTER : DT_LEFT) | + DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_END_ELLIPSIS ); if (hFont) SelectObject (hdc, hOldFont);

1 0

Jacek Caban : jscript: Added non-zero timezone offset tests.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: b5aeb661b9297a6ee6047335f42543936f593525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5aeb661b9297a6ee6047335f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:08:21 2016 +0200 jscript: Added non-zero timezone offset tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e5e6350..ca6131b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2098,6 +2098,8 @@ ok(Date.parse("Jan 20 2009 UTC") === 1232409600000, "Date.parse(\"Jan 20 2009 UT ok(Date.parse("Jan 20 2009 GMT") === 1232409600000, "Date.parse(\"Jan 20 2009 GMT\") = " + Date.parse("Jan 20 2009 GMT")); ok(Date.parse("Jan 20 2009 UTC-0") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC-0\") = " + Date.parse("Jan 20 2009 UTC-0")); ok(Date.parse("Jan 20 2009 UTC+0000") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC+0000\") = " + Date.parse("Jan 20 2009 UTC+0000")); +ok(Date.parse("Jan 20 2009 UTC-1") === 1232413200000, "Date.parse(\"Jan 20 2009 UTC-1\") = " + Date.parse("Jan 20 2009 UTC-1")); +ok(Date.parse("Jan 20 2009 UTC+1") === 1232406000000, "Date.parse(\"Jan 20 2009 UTC+1\") = " + Date.parse("Jan 20 2009 UTC+1")); ok(Date.parse("Ju 13 79 UTC") === 300672000000, "Date.parse(\"Ju 13 79 UTC\") = " + Date.parse("Ju 13 79 UTC")); ok(Date.parse("12Au91 UTC") === 681955200000, "Date.parse(\"12Au91 UTC\") = " + Date.parse("12Au91 UTC")); ok(Date.parse("7/02/17 UTC") === -1656806400000, "Date.parse(\"7/02/17 UTC\") = " + Date.parse("7/02/17 UTC"));

1 0

Henri Verbeet : d3d11: Validate offsets and sizes in parse_dxbc() (AFL).
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: e5a4da38eb159dbe2708f525cffc4c2abd8c53ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a4da38eb159dbe2708f525c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:41 2016 +0200 d3d11: Validate offsets and sizes in parse_dxbc() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 5 +++++ dlls/d3d11/utils.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c52e3e4..41fd89d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -85,6 +85,11 @@ static inline void read_dword(const char **ptr, DWORD *d) *ptr += sizeof(*d); } +static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +{ + return data_size - offset >= size; +} + void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; HRESULT parse_dxbc(const char *data, SIZE_T data_size, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 6473722..25e22f9 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -751,11 +751,23 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); + if (chunk_offset >= data_size || !require_space(chunk_offset, 2 * sizeof(DWORD), data_size)) + { + WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + return E_FAIL; + } + chunk_ptr = data + chunk_offset; read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); + if (!require_space(chunk_ptr - data, chunk_size, data_size)) + { + WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); + return E_FAIL; + } + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); if (FAILED(hr)) break; }

1 0

Henri Verbeet : d3d10: Validate offsets and sizes in parse_dxbc() (AFL).
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 994c5618b1e1e5b132e09f0960b3bf2268879817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=994c5618b1e1e5b132e09f096… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:42 2016 +0200 d3d10: Validate offsets and sizes in parse_dxbc() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 5 +++++ dlls/d3d10/utils.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 232399f..0e27dfe 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -294,6 +294,11 @@ static inline void write_dword(char **ptr, DWORD d) *ptr += sizeof(d); } +static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +{ + return data_size - offset >= size; +} + void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 9ffff13..618fdee 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -217,11 +217,23 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); + if (chunk_offset >= data_size || !require_space(chunk_offset, 2 * sizeof(DWORD), data_size)) + { + WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + return E_FAIL; + } + chunk_ptr = data + chunk_offset; read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); + if (!require_space(chunk_ptr - data, chunk_size, data_size)) + { + WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); + return E_FAIL; + } + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); if (FAILED(hr)) break; }

1 0

Henri Verbeet : d3d11: Validate offsets and sizes in shader_parse_signature() (AFL).
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: b1665527af5d7b7c402597412cf14b59fbcddd61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1665527af5d7b7c402597412… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:43 2016 +0200 d3d11: Validate offsets and sizes in shader_parse_signature() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/shader.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3d11/utils.c | 4 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 41fd89d..b3638c3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -85,9 +85,9 @@ static inline void read_dword(const char **ptr, DWORD *d) *ptr += sizeof(*d); } -static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +static inline BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { - return data_size - offset >= size; + return !count || (data_size - offset) / count >= size; } void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index f8647ff..a88c8ce 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -78,6 +78,25 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st return hr; } +static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) +{ + size_t len, max_len; + + if (offset >= data_size) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return NULL; + } + + max_len = data_size - offset; + len = strnlen(data + offset, max_len); + + if (len == max_len) + return NULL; + + return data + offset; +} + HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; @@ -85,11 +104,23 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d unsigned int i; DWORD count; + if (!require_space(0, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid data size %#x.\n", data_size); + return E_INVALIDARG; + } + read_dword(&ptr, &count); TRACE("%u elements\n", count); skip_dword_unknown(&ptr, 1); + if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) + { + WARN("Invalid count %#x (data size %#x).\n", count, data_size); + return E_INVALIDARG; + } + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); if (!e) { @@ -102,7 +133,12 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d UINT name_offset; read_dword(&ptr, &name_offset); - e[i].semantic_name = data + name_offset; + if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) + { + WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); + HeapFree(GetProcessHeap(), 0, e); + return E_INVALIDARG; + } read_dword(&ptr, &e[i].semantic_idx); read_dword(&ptr, &e[i].sysval_semantic); read_dword(&ptr, &e[i].component_type); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 25e22f9..7b08d13 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -751,7 +751,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - if (chunk_offset >= data_size || !require_space(chunk_offset, 2 * sizeof(DWORD), data_size)) + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); return E_FAIL; @@ -762,7 +762,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); - if (!require_space(chunk_ptr - data, chunk_size, data_size)) + if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); return E_FAIL;

1 0

Henri Verbeet : d3d10: Validate offsets and sizes in shader_parse_signature() (AFL).
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 22d52ed59d28340f595660d7cbacca10c6ce8858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d52ed59d28340f595660d7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:44 2016 +0200 d3d10: Validate offsets and sizes in shader_parse_signature() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 4 ++-- dlls/d3d10/effect.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3d10/utils.c | 4 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 0e27dfe..dc41224 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -294,9 +294,9 @@ static inline void write_dword(char **ptr, DWORD d) *ptr += sizeof(d); } -static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +static inline BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { - return data_size - offset >= size; + return !count || (data_size - offset) / count >= size; } void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c7eed1a..df35640 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -267,6 +267,25 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) +{ + size_t len, max_len; + + if (offset >= data_size) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return NULL; + } + + max_len = data_size - offset; + len = strnlen(data + offset, max_len); + + if (len == max_len) + return NULL; + + return data + offset; +} + static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct d3d10_effect_shader_signature *s) { D3D10_SIGNATURE_PARAMETER_DESC *e; @@ -274,11 +293,23 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct unsigned int i; DWORD count; + if (!require_space(0, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid data size %#x.\n", data_size); + return E_INVALIDARG; + } + read_dword(&ptr, &count); TRACE("%u elements\n", count); skip_dword_unknown("shader signature", &ptr, 1); + if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) + { + WARN("Invalid count %#x (data size %#x).\n", count, data_size); + return E_INVALIDARG; + } + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); if (!e) { @@ -292,7 +323,12 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct UINT mask; read_dword(&ptr, &name_offset); - e[i].SemanticName = data + name_offset; + if (!(e[i].SemanticName = shader_get_string(data, data_size, name_offset))) + { + WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); + HeapFree(GetProcessHeap(), 0, e); + return E_INVALIDARG; + } read_dword(&ptr, &e[i].SemanticIndex); read_dword(&ptr, &e[i].SystemValueType); read_dword(&ptr, &e[i].ComponentType); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 618fdee..be88d5a 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -217,7 +217,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - if (chunk_offset >= data_size || !require_space(chunk_offset, 2 * sizeof(DWORD), data_size)) + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); return E_FAIL; @@ -228,7 +228,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); - if (!require_space(chunk_ptr - data, chunk_size, data_size)) + if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); return E_FAIL;

1 0

Henri Verbeet : d3d11: Introduce a helper function to allocate arrays.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: c27b83ec07b9cb82438404a20342ed45c744b20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27b83ec07b9cb82438404a20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:45 2016 +0200 d3d11: Introduce a helper function to allocate arrays. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 7 +++++++ dlls/d3d11/inputlayout.c | 3 +-- dlls/d3d11/shader.c | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b3638c3..77079bd 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -79,6 +79,13 @@ HRESULT d3d_set_private_data(struct wined3d_private_store *store, HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; +static inline void *d3d11_calloc(SIZE_T count, SIZE_T size) +{ + if (count > ~(SIZE_T)0 / size) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); +} + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index d481dd2..69ef985 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -54,8 +54,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME return E_FAIL; } - *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(**wined3d_elements)); - if (!*wined3d_elements) + if (!(*wined3d_elements = d3d11_calloc(element_count, sizeof(**wined3d_elements)))) { ERR("Failed to allocate wined3d vertex element array memory.\n"); HeapFree(GetProcessHeap(), 0, is.elements); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index a88c8ce..b1c4f28 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -121,8 +121,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d return E_INVALIDARG; } - e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); - if (!e) + if (!(e = d3d11_calloc(count, sizeof(*e)))) { ERR("Failed to allocate input signature memory.\n"); return E_OUTOFMEMORY;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 1a182b5901589db06803d2d6f8ad6d820b80e19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a182b5901589db06803d2d6f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue May 24 22:40:04 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index edf277c..8ac99b6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-03 21:19+0300\n" +"PO-Revision-Date: 2016-05-24 22:38+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7629,7 +7629,7 @@ msgstr "Kopijuoti failus iš:" #: setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." -msgstr "Įveskite kelią iki failo, o tada spauskite Gerai." +msgstr "Įrašykite kelią iki failo, o tada spauskite Gerai." #: shdoclc.rc:42 msgid "F&orward" @@ -11557,6 +11557,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Naudojimas:\n" +" REG [operacija] [parametrai]\n" +"\n" +"Palaikomos operacijos:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Pagalbai apie specifinę operaciją, įrašykite:\n" +" REG [operacija] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11657,24 +11666,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Paieška baigta. Rasta atitikimų: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "reg: Netinkama sintaksė. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "šalinimo programa: Netinkamas parametras [%1]\n" +msgstr "reg: Netinkamas parametras [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Pagalbai įrašykite „REG /?“.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Pagalbai įrašykite „REG %1 /?“.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Hadrien Boizard : mshtml/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: c0505097f9fe71e8e78ba0c4f989acfff330d768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0505097f9fe71e8e78ba0c4f… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Fri May 20 19:15:06 2016 +0200 mshtml/tests: Use todo_wine_if() in tests. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 904322e..5079dc9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5830,9 +5830,7 @@ static void test_download(DWORD flags) if(!(flags & DWL_FROM_HISTORY)) todo_wine CHECK_CALLED(OnChanged_1012); todo_wine CHECK_CALLED(Exec_HTTPEQUIV); - if(!(flags & DWL_REFRESH)) - todo_wine CHECK_CALLED(Exec_SETTITLE); - else + todo_wine_if(!(flags & DWL_REFRESH)) CHECK_CALLED(Exec_SETTITLE); } if(!is_js) {

1 0

Alistair Leslie-Hughes : wined3d: Support missing WINED3DUSAGE flags to debug_d3dusage.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 77e1037e003c32b789263d852bdd7ecee8af77a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e1037e003c32b789263d852… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:06:08 2016 +0000 wined3d: Support missing WINED3DUSAGE flags to debug_d3dusage. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c781cd..f85fcc9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3603,7 +3603,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) const char *debug_d3dusage(DWORD usage) { - char buf[333]; + char buf[552]; buf[0] = '\0'; #define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } @@ -3617,7 +3617,14 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_NPATCHES); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICTED_CONTENT); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); #undef WINED3DUSAGE_TO_STR

1 0