April 2015 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Introduce a scratch string buffers framework.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 84ca0203bfc9c35aa651e242f297bae5ef926f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ca0203bfc9c35aa651e242f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:43 2015 +0200 wined3d: Introduce a scratch string buffers framework. --- dlls/wined3d/glsl_shader.c | 98 ++++++++++++++++++++++++------------------ dlls/wined3d/shader.c | 65 ++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++ 3 files changed, 132 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84ca0203bfc9c35aa651e…

1 0

Jacek Caban : wininet: Initialize send and receive timeouts to 0.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 07520fbf12dff4b400892aabd30ef65c4bb59997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07520fbf12dff4b400892aabd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 14:39:29 2015 +0200 wininet: Initialize send and receive timeouts to 0. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 04cd281..8a872e8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5827,8 +5827,8 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; - session->send_timeout = INFINITE; - session->receive_timeout = INFINITE; + session->send_timeout = 0; + session->receive_timeout = 0; /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(session->hdr.dwInternalFlags & INET_OPENURL))

1 0

Hans Leidekker : msvcrt: Handle NULL arguments in _mbscmp.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: bbd0e56a5832b8b6135d9300005747d07ec33cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd0e56a5832b8b6135d93000… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:04 2015 +0200 msvcrt: Handle NULL arguments in _mbscmp. --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 044c2bd..4c85b90 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -24,6 +24,7 @@ */ #include <stdio.h> +#include <limits.h> #include "msvcrt.h" #include "wine/unicode.h" @@ -769,6 +770,8 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV */ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) { + if (!str || !cmp) return INT_MAX; + if(get_mbcinfo()->ismbcodepage) { unsigned int strc, cmpc; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index cf609f7..3893ba7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2874,6 +2874,36 @@ static void test__wcsset_s(void) ok(str[2] == 'b', "str[2] = %d\n", str[2]); } +static void test__mbscmp(void) +{ + static const unsigned char a[] = {'a',0}, b[] = {'b',0}; + int ret; + + if (!p_mbrlen) + { + win_skip("_mbscmp tests\n"); + return; + } + + ret = _mbscmp(NULL, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(NULL, a); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, a); + ok(!ret, "got %d\n", ret); + + ret = _mbscmp(a, b); + ok(ret == -1, "got %d\n", ret); + + ret = _mbscmp(b, a); + ok(ret == 1, "got %d\n", ret); +} + START_TEST(string) { char mem[100]; @@ -2981,4 +3011,5 @@ START_TEST(string) test_strxfrm(); test__strnset_s(); test__wcsset_s(); + test__mbscmp(); }

1 0

Hans Leidekker : msvcr120: Add _ismbcprint export.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: da7f6c8b644caf45006520cd0e59cff17126a132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7f6c8b644caf45006520cd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:26 2015 +0200 msvcr120: Add _ismbcprint export. --- dlls/msvcr120/msvcr120.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c14ac45..811dcee 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1345,7 +1345,7 @@ @ stub _ismbclegal_l @ stub _ismbclower(long) @ stub _ismbclower_l -@ stub _ismbcprint(long) +@ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l

1 0

Hans Leidekker : advapi32: Return fake handles from RegisterTraceGuidsW.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 191b1bfbba1863c8970bee0fa026c14f91d8e93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=191b1bfbba1863c8970bee0fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:49 2015 +0200 advapi32: Return fake handles from RegisterTraceGuidsW. --- dlls/advapi32/eventlog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index bebb08b..191d817 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -772,6 +772,17 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); + + if (TraceGuidReg) + { + ULONG i; + for (i = 0; i < GuidCount; i++) + { + FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); + TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; + } + } + *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; return ERROR_SUCCESS; }

1 0

Huw Davies : rpcrt4/tests: Fix some tests on Win 8.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 9f2c668c99cba9f4dc905810f4c290a587162c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2c668c99cba9f4dc905810f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 13:17:32 2015 +0100 rpcrt4/tests: Fix some tests on Win 8. --- dlls/rpcrt4/tests/cstub.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index de0c224..d098d60 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -397,6 +397,8 @@ static BOOL check_address(void *actual, void *expected) { static void *ole32_start = NULL; static void *ole32_end = NULL; + static void *combase_start = NULL; + static void *combase_end = NULL; if (actual == expected) return TRUE; @@ -412,7 +414,21 @@ static BOOL check_address(void *actual, void *expected) ole32_end = (void *)((char *) ole32_start + nt_headers->OptionalHeader.SizeOfImage); } - return ole32_start <= actual && actual < ole32_end; + if (ole32_start <= actual && actual < ole32_end) + return TRUE; + + /* On Win8, actual can be located inside combase.dll */ + if (combase_start == NULL || combase_end == NULL) + { + PIMAGE_NT_HEADERS nt_headers; + combase_start = (void *) GetModuleHandleA("combase.dll"); + if (combase_start == NULL) + return FALSE; + nt_headers = (PIMAGE_NT_HEADERS)((char *) combase_start + ((PIMAGE_DOS_HEADER) combase_start)->e_lfanew); + combase_end = (void *)((char *) combase_start + nt_headers->OptionalHeader.SizeOfImage); + } + + return (combase_start <= actual && actual < combase_end); } static const ExtendedProxyFileInfo my_proxy_file_info =

1 0

Henri Verbeet : wined3d: Simplify shader_arb_dump_program_source().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: dd2398297c17acb2ee9fcb026e70b313ea433edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2398297c17acb2ee9fcb026… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:22 2015 +0200 wined3d: Simplify shader_arb_dump_program_source(). --- dlls/wined3d/arb_program_shader.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 96d2f74..39800f2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -50,10 +50,9 @@ static BOOL shader_is_vshader_version(enum wined3d_shader_type type) return type == WINED3D_SHADER_TYPE_VERTEX; } -/* Extract a line. Note that this modifies the source string. */ -static char *get_line(char **ptr) +static const char *get_line(const char **ptr) { - char *p, *q; + const char *p, *q; p = *ptr; if (!(q = strstr(p, "\n"))) @@ -62,33 +61,11 @@ static char *get_line(char **ptr) *ptr += strlen(p); return p; } - *q = '\0'; *ptr = q + 1; return p; } -static void shader_arb_dump_program_source(const char *source) -{ - ULONG source_size; - char *ptr, *line, *tmp; - - source_size = strlen(source) + 1; - tmp = HeapAlloc(GetProcessHeap(), 0, source_size); - if (!tmp) - { - ERR("Failed to allocate %u bytes for shader source.\n", source_size); - return; - } - memcpy(tmp, source, source_size); - - ptr = tmp; - while ((line = get_line(&ptr))) FIXME(" %s\n", line); - FIXME("\n"); - - HeapFree(GetProcessHeap(), 0, tmp); -} - enum arb_helper_value { ARB_ZERO, @@ -3282,6 +3259,7 @@ static void shader_hw_call(const struct wined3d_shader_instruction *ins) static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum target, const char *src) { + const char *ptr, *line; GLint native, pos; GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); @@ -3294,7 +3272,10 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar { FIXME_(d3d_shader)("Program error at position %d: %s\n\n", pos, debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - shader_arb_dump_program_source(src); + ptr = src; + while ((line = get_line(&ptr))) FIXME_(d3d_shader)(" %.*s", (int)(ptr - line), line); + FIXME_(d3d_shader)("\n"); + return FALSE; } }

1 0

Henri Verbeet : wined3d: Get rid of the tracing code in shader_vaddline().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: cfd280fd66b3824d6a9cec4c214e91c900d167ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd280fd66b3824d6a9cec4c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:23 2015 +0200 wined3d: Get rid of the tracing code in shader_vaddline(). --- dlls/wined3d/arb_program_shader.c | 6 +++++ dlls/wined3d/glsl_shader.c | 9 +++++++ dlls/wined3d/shader.c | 50 +++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 39800f2..7a497d2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3262,6 +3262,12 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar const char *ptr, *line; GLint native, pos; + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); checkGLcall("glProgramStringARB()"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1bf0a3..0f18019 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -344,7 +344,16 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id /* Context activation is done by the caller. */ static void shader_glsl_compile(const struct wined3d_gl_info *gl_info, GLuint shader, const char *src) { + const char *ptr, *line; + TRACE("Compiling shader object %u.\n", shader); + + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_info_log_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glShaderSource(shader, 1, &src, NULL)); checkGLcall("glShaderSource"); GL_EXTCALL(glCompileShader(shader)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c249c9a..7d0c47b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -249,8 +249,6 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) { buffer->buffer[0] = '\0'; buffer->content_size = 0; - buffer->lineNo = 0; - buffer->newline = TRUE; } BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) @@ -273,48 +271,28 @@ void shader_buffer_free(struct wined3d_shader_buffer *buffer) int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va_list args) { - char *base = buffer->buffer + buffer->content_size; + unsigned int rem; int rc; char *new_buffer; - while(1) + for (;;) { - rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); - if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) - { - new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); - if (!new_buffer) - { - ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); - buffer->content_size = buffer->buffer_size - 1; - return -1; - } - buffer->buffer = new_buffer; - buffer->buffer_size = buffer->buffer_size * 2; - base = buffer->buffer + buffer->content_size; - } - else - { + rem = buffer->buffer_size - buffer->content_size; + rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + + if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) break; - } - } - if (buffer->newline) - { - TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->content_size, base); - buffer->newline = FALSE; - } - else - { - TRACE("%s", base); + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) + { + ERR("Failed to grow buffer.\n"); + buffer->buffer[buffer->content_size] = '\0'; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; } - buffer->content_size += rc; - if (buffer->buffer[buffer->content_size-1] == '\n') - { - ++buffer->lineNo; - buffer->newline = TRUE; - } return 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2a85a..ecbec5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -440,8 +440,6 @@ struct wined3d_shader_buffer char *buffer; unsigned int buffer_size; unsigned int content_size; - unsigned int lineNo; - BOOL newline; }; enum WINED3D_SHADER_INSTRUCTION_HANDLER

1 0

Henri Verbeet : d2d1: Do not flip/ mirror the bitmap in d2d_d3d_render_target_DrawBitmap().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 4b3ca58fe969bd8b20358ed90dfe438e9bc03013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3ca58fe969bd8b20358ed90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:24 2015 +0200 d2d1: Do not flip/mirror the bitmap in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cdf82bf..f8bdf95 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -777,12 +777,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget bitmap_brush_desc.interpolationMode = interpolation_mode; brush_desc.opacity = opacity; - brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); + brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left)); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = d.left - s.left; + brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right); brush_desc.transform._12 = 0.0f; - brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); - brush_desc.transform._32 = d.top - s.top; + brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); + brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom); if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Henri Verbeet : d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap ().
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: b313680ab4d723fb6fc45581e3dfca9958bfe526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b313680ab4d723fb6fc45581e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:25 2015 +0200 d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f8bdf95..757cdac 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -779,10 +779,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.opacity = opacity; brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left)); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right); + brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right) * brush_desc.transform._11; brush_desc.transform._12 = 0.0f; brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); - brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom); + brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22; if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0