December 2012 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_GetDesc().
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 14eadb71bc08968d95a1a00a337eabaebc5cd895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eadb71bc08968d95a1a00a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:30 2012 +0100 d3d10core: Implement d3d10_sampler_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ffc4e34..4d643a0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -248,9 +248,10 @@ struct d3d10_sampler_state LONG refcount; struct wined3d_sampler *wined3d_sampler; + D3D10_SAMPLER_DESC desc; }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D10Query */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8074380..9070d85 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1476,6 +1476,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1483,8 +1486,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i return E_OUTOFMEMORY; } - hr = d3d10_sampler_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_sampler_state_init(object, desc))) { WARN("Failed to initialize sampler state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index c1018f8..c086066 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -490,7 +490,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3 static void STDMETHODCALLTYPE d3d10_sampler_state_GetDesc(ID3D10SamplerState *iface, D3D10_SAMPLER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = @@ -508,12 +512,13 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) { HRESULT hr; state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; + state->desc = *desc; if (FAILED(hr = wined3d_sampler_create(state, &state->wined3d_sampler))) {

1 0

Henri Verbeet : d3d10core: Only create unique sampler state objects.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: a9e241e4fe6c1abc34ccb43d422c44ad129bdcb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e241e4fe6c1abc34ccb43d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:31 2012 +0100 d3d10core: Only create unique sampler state objects. --- dlls/d3d10core/d3d10core_main.c | 8 ++++- dlls/d3d10core/d3d10core_private.h | 10 ++++- dlls/d3d10core/device.c | 67 ++++++++++++++++++++++++++++++++---- dlls/d3d10core/state.c | 22 ++++++++--- 4 files changed, 91 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index e977afa..78826f6 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -69,6 +69,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba void *device_object, REFIID riid, void **device_layer) { struct d3d10_device *object; + HRESULT hr; TRACE("id %#x, layer_base %p, unknown0 %#x, device_object %p, riid %s, device_layer %p\n", id, layer_base, unknown0, device_object, debugstr_guid(riid), device_layer); @@ -81,7 +82,12 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba } object = *layer_base; - d3d10_device_init(object, device_object); + if (FAILED(hr = d3d10_device_init(object, device_object))) + { + WARN("Failed to initialize device, hr %#x.\n", hr); + *device_layer = NULL; + return hr; + } *device_layer = &object->IUnknown_inner; TRACE("Created d3d10 device at %p\n", object); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4d643a0..b32825e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -35,6 +35,7 @@ #endif #include "wine/wined3d.h" #include "wine/winedxgi.h" +#include "wine/rbtree.h" #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ @@ -247,11 +248,14 @@ struct d3d10_sampler_state ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; + struct d3d10_device *device; struct wined3d_sampler *wined3d_sampler; D3D10_SAMPLER_DESC desc; + struct wine_rb_entry entry; }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device, + const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D10Query */ @@ -275,6 +279,8 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct wine_rb_tree sampler_states; + struct d3d10_blend_state *blend_state; float blend_factor[4]; UINT sample_mask; @@ -283,7 +289,7 @@ struct d3d10_device struct d3d10_rasterizer_state *rasterizer_state; }; -void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; +HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ enum dxgi_device_layer_id diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9070d85..29f1648 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -72,15 +72,16 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) { - struct d3d10_device *This = impl_from_IUnknown(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_device *device = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", device, refcount); if (!refcount) { - if (This->wined3d_device) - wined3d_device_decref(This->wined3d_device); + if (device->wined3d_device) + wined3d_device_decref(device->wined3d_device); + wine_rb_destroy(&device->sampler_states, NULL, NULL); } return refcount; @@ -1471,7 +1472,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *iface, const D3D10_SAMPLER_DESC *desc, ID3D10SamplerState **sampler_state) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_sampler_state *object; + struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); @@ -1479,6 +1482,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i if (!desc) return E_INVALIDARG; + if ((entry = wine_rb_get(&device->sampler_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_sampler_state, entry); + + TRACE("Returning existing sampler state %p.\n", object); + *sampler_state = &object->ID3D10SamplerState_iface; + ID3D10SamplerState_AddRef(*sampler_state); + + return S_OK; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1486,7 +1500,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_sampler_state_init(object, desc))) + if (FAILED(hr = d3d10_sampler_state_init(object, device, desc))) { WARN("Failed to initialize sampler state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -1908,7 +1922,38 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = device_parent_create_swapchain, }; -void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) +static void *d3d10_rb_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *d3d10_rb_realloc(void *ptr, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + +static void d3d10_rb_free(void *ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +static int d3d10_sampler_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const D3D10_SAMPLER_DESC *ka = key; + const D3D10_SAMPLER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_sampler_state, entry)->desc; + + return memcmp(ka, kb, sizeof(*ka)); +} + +static const struct wine_rb_functions d3d10_sampler_state_rb_ops = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_sampler_state_compare, +}; + +HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; @@ -1917,4 +1962,12 @@ void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) device->refcount = 1; /* COM aggregation always takes place */ device->outer_unk = outer_unknown; + + if (wine_rb_init(&device->sampler_states, &d3d10_sampler_state_rb_ops) == -1) + { + WARN("Failed to initialize sampler state rbtree.\n"); + return E_FAIL; + } + + return S_OK; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index c086066..387d561 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -438,15 +438,16 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_AddRef(ID3D10SamplerState *if static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *iface) { - struct d3d10_sampler_state *This = impl_from_ID3D10SamplerState(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_sampler_decref(This->wined3d_sampler); - HeapFree(GetProcessHeap(), 0, This); + wined3d_sampler_decref(state->wined3d_sampler); + wine_rb_remove(&state->device->sampler_states, &state->desc); + HeapFree(GetProcessHeap(), 0, state); } return refcount; @@ -512,12 +513,14 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device, + const D3D10_SAMPLER_DESC *desc) { HRESULT hr; state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; + state->device = device; state->desc = *desc; if (FAILED(hr = wined3d_sampler_create(state, &state->wined3d_sampler))) @@ -526,6 +529,13 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_ return hr; } + if (wine_rb_put(&device->sampler_states, desc, &state->entry) == -1) + { + ERR("Failed to insert sampler state entry.\n"); + wined3d_sampler_decref(state->wined3d_sampler); + return E_FAIL; + } + return S_OK; }

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateSamplerState().
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 4ec1c78ec46b5ffcb24c858c93a6ec231f9e03a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec1c78ec46b5ffcb24c858c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:32 2012 +0100 d3d10core/tests: Add a small test for ID3D10Device_CreateSamplerState(). --- dlls/d3d10core/tests/device.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a0df22a..f509b27 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -570,6 +570,52 @@ float4 main(const float4 color : COLOR) : SV_TARGET ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_sampler_state(void) +{ + ID3D10SamplerState *sampler_state1, *sampler_state2; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreateSamplerState(device, NULL, &sampler_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_WRAP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 16; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_ALWAYS; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 1.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 1.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 16.0f; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state1); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state2); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(sampler_state1 == sampler_state2, "Got different sampler state objects.\n"); + + refcount = ID3D10SamplerState_Release(sampler_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D10SamplerState_Release(sampler_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -579,4 +625,5 @@ START_TEST(device) test_create_rendertarget_view(); test_create_shader_resource_view(); test_create_shader(); + test_create_sampler_state(); }

1 0

Ken Thomases : winspool: Close read end of pipe in parent so we can detect child termination.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 436edbdfc76cd17eae5ef6b020440b6dd116774e URL: http://source.winehq.org/git/wine.git/?a=commit;h=436edbdfc76cd17eae5ef6b02… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Dec 11 22:54:05 2012 -0600 winspool: Close read end of pipe in parent so we can detect child termination. --- dlls/winspool.drv/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f23d8cc..45b49f3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8096,6 +8096,8 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) goto end; } + close(fds[0]); + fds[0] = -1; while((no_read = read(file_fd, buf, sizeof(buf))) > 0) write(fds[1], buf, no_read);

1 0

Piotr Caban : msvcr100: Added fread_s implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 101abcd8b119853ff70449be27e2322b16bbaf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101abcd8b119853ff70449be2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:14:48 2012 +0100 msvcr100: Added fread_s implementation. --- dlls/msvcr100/msvcr100.c | 54 +++++++++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 80 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/limits.h | 8 ++++ 6 files changed, 145 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 5778940..f529b10 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -25,6 +25,7 @@ #include "stdlib.h" #include "errno.h" #include "malloc.h" +#include "limits.h" #include "sys/stat.h" #include "windef.h" #include "winbase.h" @@ -404,6 +405,59 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) } /********************************************************************* + * fread_s (MSVCR100.@) + */ +size_t CDECL fread_s(void *buf, size_t buf_size, size_t elem_size, size_t count, FILE *stream) +{ + size_t bytes_left, buf_pos; + + TRACE("(%p %lu %lu %lu %p\n", buf, (unsigned long)buf_size, + (unsigned long)elem_size, (unsigned long)count, stream); + + + if(!CHECK_PMT(stream != NULL)) { + if(buf && buf_size) + memset(buf, 0, buf_size); + return 0; + } + if(!elem_size || !count) return 0; + if(!CHECK_PMT(buf != NULL)) return 0; + if(!CHECK_PMT(SIZE_MAX/count >= elem_size)) return 0; + + bytes_left = elem_size*count; + buf_pos = 0; + while(bytes_left) { + if(stream->_cnt > 0) { + size_t size = bytes_left<stream->_cnt ? bytes_left : stream->_cnt; + + if(!CHECK_PMT_ERR(size <= buf_size-buf_pos, ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + fread((char*)buf+buf_pos, 1, size, stream); + buf_pos += size; + bytes_left -= size; + }else { + int c = _filbuf(stream); + + if(c == EOF) + break; + + if(!CHECK_PMT_ERR(buf_size-buf_pos > 0, ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + ((char*)buf)[buf_pos++] = c; + bytes_left--; + } + } + + return buf_pos/elem_size; +} + +/********************************************************************* * DllMain (MSVCR100.@) */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 162ad65..70fca053 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1669,7 +1669,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ stub fread_s +@ cdecl fread_s(ptr long long long ptr) @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 366e8ee..143979d 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdlib.h> #include <wchar.h> +#include <stdio.h> #include <windef.h> #include <winbase.h> @@ -68,6 +69,9 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); +static FILE* (__cdecl *p_fopen)(const char*,const char*); +static int (__cdecl *p_fclose)(FILE*); +static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); /* make sure we use the correct errno */ #undef errno @@ -91,6 +95,9 @@ static BOOL init(void) SET(p_set_invalid_parameter_handler, "_set_invalid_parameter_handler"); SET(p_wmemcpy_s, "wmemcpy_s"); SET(p_wmemmove_s, "wmemmove_s"); + SET(p_fopen, "fopen"); + SET(p_fclose, "fclose"); + SET(p_fread_s, "fread_s"); return TRUE; } @@ -247,6 +254,78 @@ static void test_wmemmove_s(void) "Cannot reset invalid parameter handler\n"); } +static void test_fread_s(void) +{ + static const char test_file[] = "fread_s.tst"; + int ret; + char buf[10]; + + FILE *f = fopen(test_file, "w"); + if(!f) { + skip("Error creating test file\n"); + return; + } + fwrite("test", 1, 4, f); + fclose(f); + + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = p_fread_s(buf, sizeof(buf), 1, 1, NULL); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == EINVAL, "errno = %d, expected EINVAL\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + f = p_fopen(test_file, "r"); + errno = 0xdeadbeef; + ret = p_fread_s(NULL, sizeof(buf), 0, 1, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == 0xdeadbeef, "errno = %d, expected 0xdeadbeef\n", errno); + ret = p_fread_s(NULL, sizeof(buf), 1, 0, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == 0xdeadbeef, "errno = %d, expected 0xdeadbeef\n", errno); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = p_fread_s(NULL, sizeof(buf), 1, 1, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == EINVAL, "errno = %d, expected EINVAL\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + buf[1] = 'a'; + ret = p_fread_s(buf, 3, 1, 10, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(buf[0] == 0, "buf[0] = '%c', expected 0\n", buf[0]); + ok(buf[1] == 0, "buf[1] = '%c', expected 0\n", buf[1]); + ok(errno == ERANGE, "errno = %d, expected ERANGE\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = p_fread_s(buf, 2, 1, 10, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(buf[0] == 0, "buf[0] = '%c', expected 0\n", buf[0]); + ok(errno == ERANGE, "errno = %d, expected ERANGE\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + memset(buf, 'a', sizeof(buf)); + ret = p_fread_s(buf, sizeof(buf), 3, 10, f); + ok(ret==1, "fread_s returned %d, expected 1\n", ret); + ok(buf[0] == 'e', "buf[0] = '%c', expected 'e'\n", buf[0]); + ok(buf[1] == 's', "buf[1] = '%c', expected 's'\n", buf[1]); + ok(buf[2] == 't', "buf[2] = '%c', expected 't'\n", buf[2]); + ok(buf[3] == 'a', "buf[3] = '%c', expected 'a'\n", buf[3]); + p_fclose(f); + + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); + unlink(test_file); +} + START_TEST(msvcr100) { if (!init()) @@ -254,4 +333,5 @@ START_TEST(msvcr100) test_wmemcpy_s(); test_wmemmove_s(); + test_fread_s(); } diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e9274f5..2eecb7a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1323,7 +1323,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ stub fread_s +@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3b18f43..8644692 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1324,7 +1324,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ stub fread_s +@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index 938da76..d0f058b 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -38,4 +38,12 @@ #define I64_MAX _I64_MAX #define UI64_MAX _UI64_MAX +#ifndef SIZE_MAX +# ifdef _WIN64 +# define SIZE_MAX UI64_MAX +# else +# define SIZE_MAX UINT_MAX +# endif +#endif + #endif /* __WINE_LIMITS_H */

1 0

Piotr Caban : msvcrt: Fixed floating point numbers printing when flags.Sign =' '.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: d958ecbc6931cc560b5b2c562a4bcd1b1b84a68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d958ecbc6931cc560b5b2c562… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:15:12 2012 +0100 msvcrt: Fixed floating point numbers printing when flags.Sign=' '. --- dlls/msvcrt/printf.h | 40 +++++++++++++++++++++++----------------- dlls/msvcrt/tests/printf.c | 20 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 0500360..d02115e 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -78,7 +78,7 @@ static inline int FUNC_NAME(pf_fill)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ct { int i, r = 0, written; - if(flags->Sign && !(flags->Format=='d' || flags->Format=='i')) + if(flags->Sign && !strchr("diaeEfgG", flags->Format)) flags->Sign = 0; if(left && flags->Sign) { @@ -228,18 +228,8 @@ static inline int FUNC_NAME(pf_handle_string)(FUNC_NAME(puts_clbk) pf_puts, void static inline void FUNC_NAME(pf_rebuild_format_string)(char *p, FUNC_NAME(pf_flags) *flags) { *p++ = '%'; - if(flags->Sign) - *p++ = flags->Sign; - if(flags->LeftAlign) - *p++ = flags->LeftAlign; if(flags->Alternate) *p++ = flags->Alternate; - if(flags->PadZero) - *p++ = flags->PadZero; - if(flags->FieldLength) { - sprintf(p, "%d", flags->FieldLength); - p += strlen(p); - } if(flags->Precision >= 0) { sprintf(p, ".%d", flags->Precision); p += strlen(p); @@ -541,8 +531,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API HeapFree(GetProcessHeap(), 0, tmp); } else if(flags.Format && strchr("aeEfgG", flags.Format)) { char float_fmt[20], buf_a[32], *tmp = buf_a, *decimal_point; - int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; + int len = flags.Precision + 10; double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; + int r; if(flags.Format=='f') { if(val>-10.0 && val<10.0) @@ -552,16 +543,20 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API /* Default precision is 6, additional space for sign, separator and nullbyte is required */ i += (flags.Precision==-1 ? 6 : flags.Precision) + 3; - if(i > max_len) - max_len = i; + if(i > len) + len = i; } - if(max_len > sizeof(buf_a)) - tmp = HeapAlloc(GetProcessHeap(), 0, max_len); + if(len > sizeof(buf_a)) + tmp = HeapAlloc(GetProcessHeap(), 0, len); if(!tmp) return -1; FUNC_NAME(pf_rebuild_format_string)(float_fmt, &flags); + if(val < 0) { + flags.Sign = '-'; + val = -val; + } sprintf(tmp, float_fmt, val); if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') @@ -571,9 +566,20 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(decimal_point) *decimal_point = *locinfo->lconv->decimal_point; - i = FUNC_NAME(pf_output_str)(pf_puts, puts_ctx, tmp, strlen(tmp), locinfo); + len = strlen(tmp); + i = FUNC_NAME(pf_fill)(pf_puts, puts_ctx, len, &flags, TRUE); + if(i < 0) + return i; + r = FUNC_NAME(pf_output_str)(pf_puts, puts_ctx, tmp, len, locinfo); + if(r < 0) + return r; + i += r; if(tmp != buf_a) HeapFree(GetProcessHeap(), 0, tmp); + r = FUNC_NAME(pf_fill)(pf_puts, puts_ctx, len, &flags, FALSE); + if(r < 0) + return r; + i += r; } else { if(invoke_invalid_param_handler) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 1507a01..7780327 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -515,6 +515,26 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"8.6000e+000"), "failed\n"); ok( r==11, "return count wrong\n"); + format = "% 2.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer," 8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + + format = "% 014.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer," 008.6000e+000"), "failed: %s\n", buffer); + ok( r==14, "return count wrong\n"); + + format = "% 2.4e"; + r = sprintf(buffer, format,-8.6); + ok(!strcmp(buffer,"-8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + + format = "%+2.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer,"+8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + format = "%2.4g"; r = sprintf(buffer, format,8.6); ok(!strcmp(buffer,"8.6"), "failed\n");

1 0

Piotr Caban : msvcr100: Added _sprintf_p implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 77306693d4a9721034968772769b88374688ae40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77306693d4a97210349687727… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:15:33 2012 +0100 msvcr100: Added _sprintf_p implementation. --- dlls/msvcr100/msvcr100.c | 15 +++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/stdio.h | 1 + 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index f529b10..1a54c43 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -458,6 +458,21 @@ size_t CDECL fread_s(void *buf, size_t buf_size, size_t elem_size, size_t count, } /********************************************************************* + * _sprintf_p (MSVCR100.@) + */ +int CDECL _sprintf_p(char *buffer, size_t length, const char *format, ...) +{ + __ms_va_list valist; + int r; + + __ms_va_start(valist, format); + r = _vsprintf_p_l(buffer, length, format, NULL, valist); + __ms_va_end(valist); + + return r; +} + +/********************************************************************* * DllMain (MSVCR100.@) */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 70fca053..510c974 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1312,7 +1312,7 @@ @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l -@ stub _sprintf_p +@ varargs _sprintf_p(ptr long str) @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2eecb7a..27a8f6d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -974,7 +974,7 @@ @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l -@ stub _sprintf_p +@ varargs _sprintf_p(ptr long str) msvcr100._sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8644692..ccdb7e0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -967,7 +967,7 @@ @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l -@ stub _sprintf_p +@ varargs _sprintf_p(ptr long str) msvcr100._sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f277516..f6bf3b5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -125,6 +125,7 @@ int __cdecl _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); +int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*);

1 0

Piotr Caban : msvcr100: Added _get_timezone implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: c4d085bc74e55b5ffea624faafac6817d0bb87c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d085bc74e55b5ffea624faa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:15:51 2012 +0100 msvcr100: Added _get_timezone implementation. --- dlls/msvcr100/msvcr100.c | 11 +++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 1a54c43..f571aee 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -473,6 +473,17 @@ int CDECL _sprintf_p(char *buffer, size_t length, const char *format, ...) } /********************************************************************* + * _get_timezone (MSVCR100.@) + */ +int CDECL _get_timezone(LONG *timezone) +{ + if(!CHECK_PMT(timezone != NULL)) return EINVAL; + + *timezone = *(LONG*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_timezone"); + return 0; +} + +/********************************************************************* * DllMain (MSVCR100.@) */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 510c974..0729f30 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -877,7 +877,7 @@ @ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_terminate() msvcrt._get_terminate -@ stub _get_timezone +@ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected @ cdecl _get_wpgmptr(ptr) msvcrt._get_wpgmptr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 27a8f6d..bd1e86a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -535,7 +535,7 @@ @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ cdecl _get_terminate() msvcrt._get_terminate -@ stub _get_timezone +@ cdecl _get_timezone(ptr) msvcr100._get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected @ stub _get_winmajor diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ccdb7e0..2453e6f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -528,7 +528,7 @@ @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ cdecl _get_terminate() msvcrt._get_terminate -@ stub _get_timezone +@ cdecl _get_timezone(ptr) msvcr100._get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected @ cdecl _get_wpgmptr(ptr) msvcrt._get_wpgmptr

1 0

Piotr Caban : msvcrt: Added _wtoi_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 3acb238f1584256468bf592843bb55206d656a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acb238f1584256468bf59284… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:05 2012 +0100 msvcrt: Added _wtoi_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 17 +++++++++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0729f30..c57b43d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1604,7 +1604,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bd1e86a..8c53751 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1268,7 +1268,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2453e6f..500ed27 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1259,7 +1259,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ecf44fd..239e820 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1199,7 +1199,7 @@ @ cdecl _wtoi(wstr) ntdll._wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) -# stub _wtoi_l(wstr ptr) +@ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l @ cdecl _wtol(wstr) ntdll._wtol # stub _wtol_l(wstr ptr) @ cdecl _wunlink(wstr) MSVCRT__wunlink diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 555e63a..cc48968 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1438,6 +1438,23 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, } /********************************************************************* + * _wtoi_l (MSVCRT.@) + */ +int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); + + if(ret > INT_MAX) { + ret = INT_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < INT_MIN) { + ret = INT_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Added _atoi_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: b5cf3057e97aa18f4525bd4819855efb60e09836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cf3057e97aa18f4525bd481… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:19 2012 +0100 msvcrt: Added _atoi_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 17 +++++++++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c57b43d..44123a3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -693,7 +693,7 @@ @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @ stub _atoi64_l -@ stub _atoi_l +@ cdecl _atoi_l(str ptr) msvcrt._atoi_l @ stub _atol_l @ cdecl _atoldbl(ptr str) msvcrt._atoldbl @ stub _atoldbl_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8c53751..91fe34a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -349,7 +349,7 @@ @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @ stub _atoi64_l -@ stub _atoi_l +@ cdecl _atoi_l(str ptr) msvcrt._atoi_l @ stub _atol_l @ cdecl _atoldbl(ptr str) msvcrt._atoldbl @ stub _atoldbl_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 500ed27..ae3dfa2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -341,7 +341,7 @@ @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @ stub _atoi64_l -@ stub _atoi_l +@ cdecl _atoi_l(str ptr) msvcrt._atoi_l @ stub _atol_l @ cdecl _atoldbl(ptr str) msvcrt._atoldbl @ stub _atoldbl_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 239e820..6d46f82 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -306,7 +306,7 @@ @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 # stub -ret64 _atoi64_l(str ptr) -# stub _atoi_l(str ptr) +@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l # stub _atol_l(str ptr) @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl # stub _atoldbl_l(ptr str ptr) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ad33f6a..1e46488 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -915,6 +915,23 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) } /********************************************************************* + * _atoi_l (MSVCRT.@) + */ +int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); + + if(ret > INT_MAX) { + ret = INT_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < INT_MIN) { + ret = INT_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* * _strtoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0