wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSSetShaderResources().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 7112c290d17f891143ee0af24b24f52d2aff2946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7112c290d17f891143ee0af24… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:31 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetShaderResources(). 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/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 95b11e6..356f9f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1200,8 +1200,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_cs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_cs_resource_view().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: a16a4931b62bf0486db6e0f40a3d4aa992873b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16a4931b62bf0486db6e0f40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:30 2017 +0100 wined3d: Introduce wined3d_device_set_cs_resource_view(). 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/cs.c | 13 ++++++++++--- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/state.c | 15 +++++++++++++-- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/utils.c | 6 ++++-- dlls/wined3d/view.c | 6 ++++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 14 +++++++++----- include/wine/wined3d.h | 2 ++ 9 files changed, 53 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a16a4931b62bf0486db6e…

1 0

Józef Kucia : wined3d: Allocate "context-> texture_type" dynamically.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 87bf26c34419b412a97d1654dca220fabf057f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bf26c34419b412a97d1654d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:29 2017 +0100 wined3d: Allocate "context->texture_type" dynamically. 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 | 5 +++++ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 67daded..d60248d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1724,6 +1724,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->rev_tex_unit_map[s] = WINED3D_UNMAPPED_STAGE; } } + if (!(ret->texture_type = wined3d_calloc(gl_info->limits.combined_samplers, + sizeof(*ret->texture_type)))) + goto out; if (!(hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { @@ -2018,6 +2021,7 @@ out: if (hdc) wined3d_release_dc(swapchain->win_handle, hdc); device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); + HeapFree(GetProcessHeap(), 0, ret->texture_type); HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, ret->free_timestamp_queries); @@ -2064,6 +2068,7 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); + HeapFree(GetProcessHeap(), 0, context->texture_type); HeapFree(GetProcessHeap(), 0, context->fbo_key); HeapFree(GetProcessHeap(), 0, context->draw_buffers); HeapFree(GetProcessHeap(), 0, context->blit_targets); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66c1002..c678f73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1622,7 +1622,7 @@ struct wined3d_context UINT blit_w, blit_h; enum fogsource fog_source; DWORD active_texture; - DWORD texture_type[MAX_COMBINED_SAMPLERS]; + DWORD *texture_type; UINT instance_count;

1 0

Józef Kucia : wined3d: Do not read rev_tex_unit_mapping for texture units >= MAX_COMBINED_SAMPLERS.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: c808748bcf03379c27e908ff8fae8b28d931de64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c808748bcf03379c27e908ff8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:28 2017 +0100 wined3d: Do not read rev_tex_unit_mapping for texture units >= MAX_COMBINED_SAMPLERS. 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/texture.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 037682d..e05d96a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -806,8 +806,6 @@ void wined3d_texture_bind(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { - DWORD active_sampler; - /* We don't need a specific texture unit, but after binding the texture * the current unit is dirty. Read the unit back instead of switching to * 0, this avoids messing around with the state manager's GL states. The @@ -817,9 +815,12 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, * called from sampler() in state.c. This means we can't touch anything * other than whatever happens to be the currently active texture, or we * would risk marking already applied sampler states dirty again. */ - active_sampler = context->rev_tex_unit_map[context->active_texture]; - if (active_sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + if (context->active_texture < MAX_COMBINED_SAMPLERS) + { + DWORD active_sampler = context->rev_tex_unit_map[context->active_texture]; + if (active_sampler != WINED3D_UNMAPPED_STAGE) + context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + } /* FIXME: Ideally we'd only do this when touching a binding that's used by * a shader. */ context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING);

1 0

Józef Kucia : wined3d: Do not try to invalidate compute states for freshly created contexts.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: f5de7186aa5669982227acde39cc0324fa69e8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5de7186aa5669982227acde3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:27 2017 +0100 wined3d: Do not try to invalidate compute states for freshly created contexts. The context_invalidate_state() function doesn't handle compute states properly. 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a58a905..67daded 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1828,11 +1828,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->d3d_info = d3d_info; ret->state_table = device->StateTable; - /* Mark all states dirty to force a proper initialization of the states - * on the first use of the context. */ + /* Mark all states dirty to force a proper initialization of the states on + * the first use of the context. Compute states do not need initialization. */ for (state = 0; state <= STATE_HIGHEST; ++state) { - if (ret->state_table[state].representative) + if (ret->state_table[state].representative && !STATE_IS_COMPUTE(state)) context_invalidate_state(ret, state); }

1 0

Józef Kucia : wined3d: Load unordered access resources before binding shader resources.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: cab9282d10e4b2868a0dd85383b1126c0d6c591a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab9282d10e4b2868a0dd8538… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:26 2017 +0100 wined3d: Load unordered access resources before binding shader resources. Loading a texture might invalidate shader resource view bindings. 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 | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 93b49a0..a58a905 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3406,16 +3406,13 @@ static void context_bind_shader_resources(struct wined3d_context *context, const } } -static void context_bind_unordered_access_views(struct wined3d_context *context, +static void context_load_unordered_access_resources(struct wined3d_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture = NULL; + struct wined3d_texture *texture; struct wined3d_buffer *buffer; - GLuint texture_name; unsigned int i; - GLint level; context->uses_uavs = 0; @@ -3428,11 +3425,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; if (!(view = views[i])) - { - WARN("No unordered access view bound at index %u.\n", i); - GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); continue; - } if (view->resource->type == WINED3D_RTYPE_BUFFER) { @@ -3448,14 +3441,41 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, } context->uses_uavs = 1; + } +} + +static void context_bind_unordered_access_views(struct wined3d_context *context, + const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_unordered_access_view *view; + GLuint texture_name; + unsigned int i; + GLint level; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!(view = views[i])) + { + WARN("No unordered access view bound at index %u.\n", i); + GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); + continue; + } if (view->gl_view.name) { texture_name = view->gl_view.name; level = 0; } - else if (texture) + else if (view->resource->type != WINED3D_RTYPE_BUFFER) { + struct wined3d_texture *texture = texture_from_resource(view->resource); texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; level = view->desc.u.texture.level_idx; } @@ -3496,6 +3516,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, context_update_tex_unit_map(context, state); context_preload_textures(context, state); context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], + state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); /* TODO: Right now the dependency on the vertex shader is necessary * since context_stream_info_from_declaration depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some @@ -3579,6 +3601,8 @@ void context_apply_compute_state(struct wined3d_context *context, unsigned int state_id, i, j; context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) {

1 0

Francois Gouget : wine/test.h: Identify the process responsible for test summary lines.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 873eace6e496a154f333426aeb2b3e0ad79ba44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=873eace6e496a154f333426ae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 22 15:33:21 2017 +0100 wine/test.h: Identify the process responsible for test summary lines. Currently the child process summary lines are indistinguishable from the main process one. This makes it impossible to automatically detect when a process exits abruptly, i.e. without printing a summary line, if it has run a subprocess. This will let analysis tools identify which summary lines correspond to processes they started and thus when some are missing. Note also that in case of a crash the 'unhandled exception' play the same role as the test summary lines. Thus it is important to also tag them with the pid of the source process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 8 +++++--- programs/winetest/main.c | 14 +++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index f33ab9a..bf353a5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -590,8 +590,9 @@ static int run_test( const char *name ) if (winetest_debug) { - printf( "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, successes + failures + todo_successes + todo_failures, + printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test->name, + successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); @@ -617,7 +618,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n", data->current_file, data->current_line ); - printf( "%s: unhandled exception %08x at %p\n", current_test->name, + printf( "%04x:%s: unhandled exception %08x at %p\n", + GetCurrentProcessId(), current_test->name, ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); return EXCEPTION_EXECUTE_HANDLER; diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 9c32573..c8ff102 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -609,7 +609,7 @@ static void append_path( const char *path) value of WaitForSingleObject. */ static int -run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) +run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, DWORD* pid) { STARTUPINFOA si; PROCESS_INFORMATION pi; @@ -627,9 +627,13 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, tempdir, &si, &pi)) + { + if (pid) *pid = 0; return -2; + } CloseHandle (pi.hThread); + if (pid) *pid = pi.dwProcessId; status = wait_process( pi.hProcess, ms ); switch (status) { @@ -713,7 +717,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) /* We need to add the path (to the main dll) to PATH */ append_path(test->maindllpath); } - status = run_ex (cmd, subfile, tempdir, 5000); + status = run_ex (cmd, subfile, tempdir, 5000, NULL); err = GetLastError(); if (test->maindllpath) { /* Restore PATH again */ @@ -785,13 +789,13 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch else { int status; - DWORD start = GetTickCount(); + DWORD pid, start = GetTickCount(); char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s -\n", test->name, subtest, file); - status = run_ex (cmd, out_file, tempdir, 120000); + status = run_ex (cmd, out_file, tempdir, 120000, &pid); heap_free (cmd); - xprintf ("%s:%s done (%d) in %ds\n", test->name, subtest, status, (GetTickCount()-start)/1000); + xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); if (status) failures++; } if (failures) report (R_STATUS, "Running tests - %u failures", failures);

1 0

Hans Leidekker : webservices: Enforce the heap limit.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 46315d8d2776a904487d9374e98c53ae5572c67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46315d8d2776a904487d9374e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 22 15:48:01 2017 +0100 webservices: Enforce the heap limit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 73 ++++++++++++++++++++++++---------- dlls/webservices/tests/reader.c | 10 ++--- dlls/webservices/url.c | 16 ++++---- dlls/webservices/webservices_private.h | 4 +- dlls/webservices/writer.c | 12 +++--- 5 files changed, 75 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46315d8d2776a904487d9…

1 0

Piotr Caban : msvcrt: Use charmax to initialize lconv fields.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: ec650d88f4eec02732423e020e350f380c5cdc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec650d88f4eec02732423e020… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 22 14:53:21 2017 +0100 msvcrt: Use charmax to initialize lconv fields. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c3e5630..6e16311 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1342,14 +1342,14 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lconv->mon_grouping[0] = '\0'; locinfo->lconv->positive_sign[0] = '\0'; locinfo->lconv->negative_sign[0] = '\0'; - locinfo->lconv->int_frac_digits = 127; - locinfo->lconv->frac_digits = 127; - locinfo->lconv->p_cs_precedes = 127; - locinfo->lconv->p_sep_by_space = 127; - locinfo->lconv->n_cs_precedes = 127; - locinfo->lconv->n_sep_by_space = 127; - locinfo->lconv->p_sign_posn = 127; - locinfo->lconv->n_sign_posn = 127; + locinfo->lconv->int_frac_digits = charmax; + locinfo->lconv->frac_digits = charmax; + locinfo->lconv->p_cs_precedes = charmax; + locinfo->lconv->p_sep_by_space = charmax; + locinfo->lconv->n_cs_precedes = charmax; + locinfo->lconv->n_sep_by_space = charmax; + locinfo->lconv->p_sign_posn = charmax; + locinfo->lconv->n_sign_posn = charmax; #if _MSVCR_VER >= 100 locinfo->lconv->_W_int_curr_symbol = MSVCRT_malloc(sizeof(MSVCRT_wchar_t));

1 0

Piotr Caban : ucrtbase: Add __initialize_lconv_for_unsigned_char implementation.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 7b0a58f217db73e3664ca4f7d5adf492ce91d015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0a58f217db73e3664ca4f7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 22 14:37:45 2017 +0100 ucrtbase: Add __initialize_lconv_for_unsigned_char implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 60c588b..12bbbe6 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl ___lc_locale_name_func() ucrtbase.___lc_locale_name_func @ cdecl ___mb_cur_max_func() ucrtbase.___mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) ucrtbase.___mb_cur_max_l_func -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() ucrtbase.__initialize_lconv_for_unsigned_char @ cdecl __pctype_func() ucrtbase.__pctype_func @ stub __pwctype_func @ cdecl _configthreadlocale(long) ucrtbase._configthreadlocale diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2f733c3..4bcd12e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -91,7 +91,7 @@ @ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017