March 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Re-implement processRegLinesW().
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 6b6e2cb92448dff4420a767abc43af50247b8f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6e2cb92448dff4420a767ab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 16 12:05:00 2017 +0000 regedit: Re-implement processRegLinesW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 163 +++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 102 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 25c0240..a88f632 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -793,120 +793,79 @@ static void processRegLinesA(FILE *in, char* first_chars) HeapFree(GetProcessHeap(), 0, buf); } -static void processRegLinesW(FILE *in) +static WCHAR *get_lineW(FILE *fp) { - WCHAR* buf = NULL; /* line read from input stream */ - ULONG lineSize = REG_VAL_BUF_SIZE; - size_t CharsInBuf = -1; + static size_t size; + static WCHAR *buf, *next; + WCHAR *line; - WCHAR* s; /* The pointer into buf for where the current fgets should read */ - WCHAR* line; /* The start of the current line */ - - buf = HeapAlloc(GetProcessHeap(), 0, lineSize * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(buf); - - s = buf; - line = buf; - - while(!feof(in)) { - size_t size_remaining; - int size_to_get; - WCHAR *s_eol = NULL; /* various local uses */ + if (!size) + { + size = REG_VAL_BUF_SIZE; + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(buf); + *buf = 0; + next = buf; + } + line = next; - /* Do we need to expand the buffer ? */ - assert (s >= buf && s <= buf + lineSize); - size_remaining = lineSize - (s-buf); - if (size_remaining < 2) /* room for 1 character and the \0 */ + while (next) + { + static const WCHAR line_endings[] = {'\r','\n',0}; + WCHAR *p = strpbrkW(line, line_endings); + if (!p) { - WCHAR *new_buffer; - size_t new_size = lineSize + (REG_VAL_BUF_SIZE / sizeof(WCHAR)); - if (new_size > lineSize) /* no arithmetic overflow */ - new_buffer = HeapReAlloc (GetProcessHeap(), 0, buf, new_size * sizeof(WCHAR)); - else - new_buffer = NULL; - CHECK_ENOUGH_MEMORY(new_buffer); - buf = new_buffer; + size_t len, count; + len = strlenW(next); + memmove(buf, next, (len + 1) * sizeof(WCHAR)); + if (size - len < 3) + { + WCHAR *new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, (size * 2) * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(new_buf); + buf = new_buf; + size *= 2; + } + if (!(count = fread(buf + len, sizeof(WCHAR), size - len - 1, fp))) + { + next = NULL; + return buf; + } + buf[len + count] = 0; + next = buf; line = buf; - s = buf + lineSize - size_remaining; - lineSize = new_size; - size_remaining = lineSize - (s-buf); + continue; } - - /* Get as much as possible into the buffer, terminated either by - * eof, error or getting the maximum amount. Abort on error. - */ - size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - - CharsInBuf = fread(s, sizeof(WCHAR), size_to_get - 1, in); - s[CharsInBuf] = 0; - - if (CharsInBuf == 0) { - if (ferror(in)) { - perror ("While reading input"); - exit (IO_ERROR); - } else { - assert (feof(in)); - *s = '\0'; - /* It is not clear to me from the definition that the - * contents of the buffer are well defined on detecting - * an eof without managing to read anything. - */ - } + next = p + 1; + if (*p == '\r' && *(p + 1) == '\n') next++; + *p = 0; + if (*(p - 1) == '\\') + { + *(--p) = 0; + while (*next && (*next == ' ' || *next == '\t')) next++; + memmove(p, next, (strlenW(next) + 1) * sizeof(WCHAR)); + next = line; + continue; } - - /* If we didn't read the eol nor the eof go around for the rest */ - while(1) + if (*line == ';' || *line == '#') { - const WCHAR line_endings[] = {'\r','\n',0}; - s_eol = strpbrkW(line, line_endings); - - if(!s_eol) { - /* Move the stub of the line to the start of the buffer so - * we get the maximum space to read into, and so we don't - * have to recalculate 'line' if the buffer expands */ - MoveMemory(buf, line, (strlenW(line)+1) * sizeof(WCHAR)); - line = buf; - s = strchrW(line, '\0'); - break; - } - - /* If it is a comment line then discard it and go around again */ - if (*line == '#' || *line == ';') { - if (*s_eol == '\r' && *(s_eol+1) == '\n') - line = s_eol + 2; - else - line = s_eol + 1; - continue; - } - - /* If there is a concatenating \\ then go around again */ - if (*(s_eol-1) == '\\') { - WCHAR* NextLine = s_eol + 1; - - if(*s_eol == '\r' && *(s_eol+1) == '\n') - NextLine++; - - while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t') - NextLine++; - - MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - s) + 1)*sizeof(WCHAR)); - CharsInBuf -= NextLine - s_eol + 1; - continue; - } - - /* Remove any line feed. Leave s_eol on the last \0 */ - if (*s_eol == '\r' && *(s_eol + 1) == '\n') - *s_eol++ = '\0'; - *s_eol = '\0'; - - processRegEntry(line, TRUE); - line = s_eol + 1; + line = next; + continue; } + return line; } + HeapFree( GetProcessHeap(), 0, buf ); + size = 0; + return NULL; +} - closeKey(); +static void processRegLinesW(FILE *fp) +{ + WCHAR *line; - HeapFree(GetProcessHeap(), 0, buf); + while ((line = get_lineW(fp))) + processRegEntry(line, TRUE); + + closeKey(); } /******************************************************************************

1 0

Jacek Caban : server: Introduce server-side I/O mode for named pipes.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: a8023d300cd9bb99a99d29a44c02e586d10756b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8023d300cd9bb99a99d29a44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 15 23:25:38 2017 +0100 server: Introduce server-side I/O mode for named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index a75f70b..0f6cf3d 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -277,6 +277,12 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_reselect_async /* reselect_async */ }; +/* Returns if we handle I/O via server calls. Currently disabled. */ +static int use_server_io( struct pipe_end *pipe_end ) +{ + return 0; /* FIXME */ +} + static void named_pipe_dump( struct object *obj, int verbose ) { fputs( "Named pipe\n", stderr ); @@ -394,7 +400,8 @@ static void do_disconnect( struct pipe_server *server ) server->client->pipe_end.fd = NULL; } assert( server->pipe_end.fd ); - shutdown( get_unix_fd( server->pipe_end.fd ), SHUT_RDWR ); + if (!use_server_io( &server->pipe_end )) + shutdown( get_unix_fd( server->pipe_end.fd ), SHUT_RDWR ); release_object( server->pipe_end.fd ); server->pipe_end.fd = NULL; } @@ -539,6 +546,9 @@ static int pipe_data_remaining( struct pipe_server *server ) assert( server->client ); + if (use_server_io( &server->pipe_end )) + return 0; + fd = get_unix_fd( server->client->pipe_end.fd ); if (fd < 0) return 0; @@ -590,7 +600,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int b handle = pipe_end_flush( &server->pipe_end, async, blocking ); /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ - if (handle && !server->flush_poll) + if (handle && !use_server_io( &server->pipe_end ) && !server->flush_poll) server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); return handle; } @@ -806,7 +816,22 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize ))) { - if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) + if (use_server_io( &server->pipe_end )) + { + client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); + if (client->pipe_end.fd) + { + set_fd_signaled( client->pipe_end.fd, 1 ); + server->pipe_end.fd = (struct fd *)grab_object( server->ioctl_fd ); + set_no_fd_status( server->ioctl_fd, STATUS_BAD_DEVICE_TYPE ); + } + else + { + release_object( client ); + client = NULL; + } + } + else if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) { assert( !server->pipe_end.fd ); @@ -831,14 +856,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc server->pipe_end.fd = create_anonymous_fd( &pipe_server_fd_ops, fds[0], &server->pipe_end.obj, server->options ); if (client->pipe_end.fd && server->pipe_end.fd) { - allow_fd_caching( client->pipe_end.fd ); - allow_fd_caching( server->pipe_end.fd ); fd_copy_completion( server->ioctl_fd, server->pipe_end.fd ); - if (server->state == ps_wait_open) - fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); - set_server_state( server, ps_connected_server ); - server->client = client; - client->server = server; } else { @@ -854,6 +872,13 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc } if (client) { + allow_fd_caching( client->pipe_end.fd ); + allow_fd_caching( server->pipe_end.fd ); + if (server->state == ps_wait_open) + fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + set_server_state( server, ps_connected_server ); + server->client = client; + client->server = server; server->pipe_end.connection = &client->pipe_end; client->pipe_end.connection = &server->pipe_end; }

1 0

Akihiro Sagawa : explorer: Use neutral language for the version resource.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: ecd34e5896ba8c9900fdc5e0ef40a4f6737da57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd34e5896ba8c9900fdc5e0e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:04 2017 +0900 explorer: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/explorer/explorer.rc b/programs/explorer/explorer.rc index 53224a8..b9ca5d8 100644 --- a/programs/explorer/explorer.rc +++ b/programs/explorer/explorer.rc @@ -33,6 +33,8 @@ STRINGTABLE IDS_RUN "&Run..." } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Explorer" #define WINE_FILENAME_STR "explorer.exe" #define WINE_FILEVERSION 6,1,7601,17567

1 0

Józef Kucia : wined3d: Use wined3d samplers unconditionally for applying legacy sampler states.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 591a3b1be84c1f3599fdc31b26d43facbbd9781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=591a3b1be84c1f3599fdc31b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:07 2017 +0100 wined3d: Use wined3d samplers unconditionally for applying legacy sampler states. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8084cfb..7fcd2b9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3611,51 +3611,41 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { - struct wined3d_texture *texture = state->textures[sampler_idx]; BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; const DWORD *sampler_states = state->sampler_states[sampler_idx]; + struct wined3d_texture *texture = state->textures[sampler_idx]; + struct wined3d_device *device = context->device; struct wined3d_sampler_desc desc; + struct wined3d_sampler *sampler; + struct wine_rb_entry *entry; struct gl_texture *gl_tex; unsigned int base_level; wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); wined3d_texture_bind(texture, context, srgb); - if (!gl_info->supported[ARB_SAMPLER_OBJECTS]) + + if ((entry = wine_rb_get(&device->samplers, &desc))) { - wined3d_texture_apply_sampler_desc(texture, &desc, context); + sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); } else { - struct wined3d_device *device = context->device; - struct wined3d_sampler *sampler; - struct wine_rb_entry *entry; - - if ((entry = wine_rb_get(&device->samplers, &desc))) + if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) { - sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); + ERR("Failed to create sampler.\n"); + sampler = NULL; } else { - if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) - { - ERR("Failed to create sampler.\n"); - sampler = NULL; - } - else - { - if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) - ERR("Failed to insert sampler.\n"); - } - } - - if (sampler) - { - GL_EXTCALL(glBindSampler(mapped_stage, sampler->name)); - checkGLcall("glBindSampler"); + if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) + ERR("Failed to insert sampler.\n"); } } + if (sampler) + wined3d_sampler_bind(sampler, mapped_stage, texture, context); + if (texture->flags & WINED3D_TEXTURE_COND_NP2) base_level = 0; else if (desc.mip_filter == WINED3D_TEXF_NONE)

1 0

Józef Kucia : wined3d: Remove irrelevant comment.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 2c7381e3296e424350ec009c0ae127dff38defa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7381e3296e424350ec009c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:10 2017 +0100 wined3d: Remove irrelevant comment. The transform_texture() function calls context_active_texture(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8ff1b46..7ad98b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3494,10 +3494,7 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates * wined3d_texture_apply_state_changes() multiplies the set matrix with a fixup matrix. Before the - * scaling is reapplied or removed, the texture matrix has to be reapplied - * - * The mapped stage is already active because the sampler() function below, which is part of the - * misc pipeline + * scaling is reapplied or removed, the texture matrix has to be reapplied. */ if (sampler < MAX_TEXTURES) { @@ -3599,7 +3596,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state TRACE("Sampler %u.\n", sampler_idx); - if (mapped_stage == WINED3D_UNMAPPED_STAGE) { TRACE("No sampler mapped to stage %u. Returning.\n", sampler_idx);

1 0

Akihiro Sagawa : regsvr32: Use neutral language for the version resource.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: cd37c6e13b3632af2f0a5f4b11f94e492369d967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd37c6e13b3632af2f0a5f4b1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:03 2017 +0900 regsvr32: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index 3169b71..c7fc2c3 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -50,6 +50,8 @@ Options:\n\ STRING_UNINSTALL_SUCCESSFUL, "regsvr32: Successfully uninstalled DLL '%1'\n" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Register Server" #define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP

1 0

Józef Kucia : wined3d: Create wined3d sampler for NULL sampler.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: f82a437a90280b8682dd22169cb335a1dc4c6fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82a437a90280b8682dd22169… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:05 2017 +0100 wined3d: Create wined3d sampler for NULL sampler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 35 ++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b554b00..baba979 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3433,7 +3433,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) sampler_name = sampler->name; else - sampler_name = device->null_sampler; + sampler_name = device->null_sampler->name; context_active_texture(context, gl_info, bind_idx); GL_EXTCALL(glBindSampler(bind_idx, sampler_name)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba30d20..a34cb97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -775,7 +775,6 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d /* Context activation is done by the caller. */ static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_sampler_desc desc; HRESULT hr; @@ -806,37 +805,27 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 device->default_sampler = NULL; } - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + /* In D3D10+, a NULL sampler maps to the default sampler state. */ + desc.address_u = WINED3D_TADDRESS_CLAMP; + desc.address_v = WINED3D_TADDRESS_CLAMP; + desc.address_w = WINED3D_TADDRESS_CLAMP; + desc.mag_filter = WINED3D_TEXF_LINEAR; + desc.min_filter = WINED3D_TEXF_LINEAR; + desc.mip_filter = WINED3D_TEXF_LINEAR; + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->null_sampler))) { - /* In D3D10+, a NULL sampler maps to the default sampler state. */ - GL_EXTCALL(glGenSamplers(1, &device->null_sampler)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE)); - checkGLcall("Create null sampler"); - } - else - { - device->null_sampler = 0; + ERR("Failed to create null sampler, hr %#x.n", hr); + device->null_sampler = NULL; } } /* Context activation is done by the caller. */ static void destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; - wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; - - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) - { - GL_EXTCALL(glDeleteSamplers(1, &device->null_sampler)); - checkGLcall("glDeleteSamplers"); - } - - device->null_sampler = 0; + wined3d_sampler_decref(device->null_sampler); + device->null_sampler = NULL; } static LONG fullscreen_style(LONG style) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6b683aa..3b342d8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2689,7 +2689,7 @@ struct wined3d_device /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ struct wined3d_sampler *default_sampler; - GLuint null_sampler; + struct wined3d_sampler *null_sampler; /* Command stream */ struct wined3d_cs *cs;

1 0

Nikolay Sivov : dwrite/tests: Initial test for HasKerningPairs().
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: cfe0f33a4abf882c68259e6148a59d41d28ea0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe0f33a4abf882c68259e614… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 21:29:34 2017 +0300 dwrite/tests: Initial test for HasKerningPairs(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 52c64ab..2bdc024 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -41,6 +41,7 @@ #define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') +#define MS_KERN_TAG DWRITE_MAKE_OPENTYPE_TAG('k','e','r','n') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -6783,6 +6784,80 @@ static void test_HasVerticalGlyphVariants(void) IDWriteFactory_Release(factory); } +static void test_HasKerningPairs(void) +{ + IDWriteFontCollection *syscollection; + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + UINT32 count, i; + HRESULT hr; + + factory = create_factory(); + fontface = create_fontface(factory); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + IDWriteFontFace_Release(fontface); + if (hr != S_OK) { + win_skip("HasKerningPairs() is not supported.\n"); + IDWriteFactory_Release(factory); + return; + } + IDWriteFontFace1_Release(fontface1); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + IDWriteLocalizedStrings *names; + BOOL exists, has_kerningpairs; + IDWriteFontFamily *family; + IDWriteFont *font; + WCHAR nameW[256]; + const void *data; + void *context; + UINT32 size; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + exists = FALSE; + hr = IDWriteFontFace1_TryGetFontTable(fontface1, MS_KERN_TAG, &data, &size, &context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFace1_ReleaseFontTable(fontface1, context); + + has_kerningpairs = IDWriteFontFace1_HasKerningPairs(fontface1); + if (!exists) + ok(!has_kerningpairs, "%s: expected %d, got %d\n", wine_dbgstr_w(nameW), exists, has_kerningpairs); + + IDWriteLocalizedStrings_Release(names); + IDWriteFont_Release(font); + + IDWriteFontFace1_Release(fontface1); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(syscollection); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -6841,6 +6916,7 @@ START_TEST(font) test_GetFontSignature(); test_font_properties(); test_HasVerticalGlyphVariants(); + test_HasKerningPairs(); IDWriteFactory_Release(factory); }

1 0

Jacek Caban : xmllite: Fixed buffer handling in reader_parse_reference.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: a3d78064d981ca4e1fa3d0ebe2adcbccdb9a8cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d78064d981ca4e1fa3d0ebe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 20 14:01:11 2017 +0100 xmllite: Fixed buffer handling in reader_parse_reference. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 1 + dlls/xmllite/tests/reader.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 7c9f76a..c33d9bf 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2122,6 +2122,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); memmove(start+1, ptr+1, len); buffer->cur = cur + 1; + buffer->written -= (ptr - start) * sizeof(WCHAR); *start = ch; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c710894..47192f9 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2241,8 +2241,8 @@ static void test_namespaceuri(void) static void test_read_charref(void) { - static const char testA[] = "<a b=\"c\">ǳă</a>"; - static const WCHAR chardataW[] = {0x01f3,0x0103,0}; + static const char testA[] = "<a b=\"c\">ǳă></a>"; + static const WCHAR chardataW[] = {0x01f3,0x0103,'>',0}; const WCHAR *value; IXmlReader *reader; XmlNodeType type; @@ -2252,7 +2252,7 @@ static void test_read_charref(void) hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - stream = create_stream_on_data(testA, sizeof(testA)); + stream = create_stream_on_data(testA, sizeof(testA)-1); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "got %08x\n", hr); @@ -2272,6 +2272,10 @@ static void test_read_charref(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type); + hr = IXmlReader_Read(reader, &type); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); + IXmlReader_Release(reader); IStream_Release(stream); }

1 0

Hugh McMaster : comctl32/tests: Move the WineTest subkey in toolbar.c into HKEY_CURRENT_USER\Software\Wine.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 6797ee0abfdb33fe444a7c6f9b0f1559b72e16c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6797ee0abfdb33fe444a7c6f9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 20 11:57:51 2017 +0000 comctl32/tests: Move the WineTest subkey in toolbar.c into HKEY_CURRENT_USER\Software\Wine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index a8bcd40..2d12732 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2276,7 +2276,8 @@ static void test_save(void) { HWND wnd = NULL; TBSAVEPARAMSW params; - static const WCHAR subkey[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','T','e','s','t',0}; + static const WCHAR subkey[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'W','i','n','e','T','e','s','t',0}; static const WCHAR value[] = {'t','o','o','l','b','a','r','t','e','s','t',0}; LONG res; HKEY key;

1 0