wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

André Hentschel : include: Define SIO_SET_COMPATIBILITY_MODE.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b45454c155a1a35caa987f08188a1f8069f7e7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45454c155a1a35caa987f081… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 14 20:40:33 2010 +0100 include: Define SIO_SET_COMPATIBILITY_MODE. --- include/mswsock.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 322ab20..1447a8d 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -84,8 +84,10 @@ extern "C" { #ifndef USE_WS_PREFIX #define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12) +#define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #else #define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) +#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET

1 0

Henri Verbeet : d3d8: Fix some return values.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: f024e2372f091f1d1a071d6dcac7f30042d864ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f024e2372f091f1d1a071d6dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:31 2010 +0100 d3d8: Fix some return values. --- dlls/d3d8/device.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7700dfb..67edb06 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -464,9 +464,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", iface, XHotSpot, YHotSpot, pCursorBitmap); - if(!pCursorBitmap) { - WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + if (!pCursorBitmap) + { + WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); @@ -903,11 +904,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID destFormat = winedesc.format; /* Check that the source and destination formats match */ - if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { - WARN("(%p) source %p format must match the dest %p format, returning WINED3DERR_INVALIDCALL\n", iface, pSourceSurface, pDestinationSurface); + if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) + { + WARN("Source %p format must match the dest %p format, returning D3DERR_INVALIDCALL.\n", + pSourceSurface, pDestinationSurface); wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; - } else if (WINED3DFMT_UNKNOWN == destFormat) { + return D3DERR_INVALIDCALL; + } + else if (WINED3DFMT_UNKNOWN == destFormat) + { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat); }

1 0

Henri Verbeet : d3d9: Fix some return values.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 06581b45136307b620e4100162104d82c55d6ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06581b45136307b620e410016… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:30 2010 +0100 d3d9: Fix some return values. --- dlls/d3d9/device.c | 39 ++++++++++++++++++++------------------- dlls/d3d9/surface.c | 5 +++-- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1c2aa99..d453350 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -420,9 +420,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", iface, XHotSpot, YHotSpot, pCursorBitmap); - if(!pCursorBitmap) { - WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + if (!pCursorBitmap) + { + WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); @@ -616,7 +617,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(LPDIRECT3DDE This->notreset = TRUE; wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; + return D3DERR_INVALIDCALL; } localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; @@ -2717,7 +2718,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(IDirect3DD FIXME("iface %p, width %u, height %u, rows %p, columns %p stub!\n", iface, width, height, rows, columns); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *iface, @@ -2729,7 +2730,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *if iface, src_surface, dst_surface, src_descs, rect_count, dst_descs, operation, offset_x, offset_y); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(IDirect3DDevice9Ex *iface, @@ -2739,28 +2740,28 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(IDirect3DDevice9Ex *iface FIXME("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p, flags %#x stub!\n", iface, src_rect, dst_rect, dst_window_override, dirty_region, flags); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT *priority) { FIXME("iface %p, priority %p stub!\n", iface, priority); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_SetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT priority) { FIXME("iface %p, priority %d stub!\n", iface, priority); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_WaitForVBlank(IDirect3DDevice9Ex *iface, UINT swapchain_idx) { FIXME("iface %p, swapchain_idx %u stub!\n", iface, swapchain_idx); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDevice9Ex *iface, @@ -2769,14 +2770,14 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDev FIXME("iface %p, resources %p, resource_count %u stub!\n", iface, resources, resource_count); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency) @@ -2785,7 +2786,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDev *max_latency = 2; - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) @@ -2797,7 +2798,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex if (!i++) FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); - return WINED3D_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevice9Ex *iface, @@ -2809,7 +2810,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevic iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(IDirect3DDevice9Ex *iface, @@ -2819,7 +2820,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(IDire FIXME("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p, usage %#x stub!\n", iface, width, height, format, pool, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex *iface, @@ -2831,7 +2832,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(IDirect3DDevice9Ex *iface, @@ -2839,7 +2840,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(IDirect3DDevice9Ex *iface, { FIXME("iface %p, present_parameters %p, mode %p stub!\n", iface, present_parameters, mode); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(IDirect3DDevice9Ex *iface, @@ -2847,7 +2848,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(IDirect3DDevice9 { FIXME("iface %p, swapchain_idx %u, mode %p, rotation %p stub!\n", iface, swapchain_idx, mode, rotation); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static const IDirect3DDevice9ExVtbl Direct3DDevice9_Vtbl = diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 76c5e98..6601530 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -325,8 +325,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, hr = IWineD3DSurface_ReleaseDC(This->wineD3DSurface, hdc); wined3d_mutex_unlock(); - switch(hr) { - case WINEDDERR_NODC: return WINED3DERR_INVALIDCALL; + switch (hr) + { + case WINEDDERR_NODC: return D3DERR_INVALIDCALL; default: return hr; } }

1 0

Henri Verbeet : wined3d: buffer_get_sysmem() potentially invalidates the current element array buffer binding.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: fadd192cba73af4e1617d8f9c85091df3334bd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadd192cba73af4e1617d8f9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:29 2010 +0100 wined3d: buffer_get_sysmem() potentially invalidates the current element array buffer binding. This fixes a regression introduced by commit 2a7a2371709233bc87071bbab43e87955cb122ca. --- dlls/wined3d/buffer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2306d1f..7400fd8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -678,6 +678,12 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_inf This->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + RESOURCE_ALIGNMENT); This->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + + if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + { + IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_INDEXBUFFER); + } + ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); GL_EXTCALL(glGetBufferSubDataARB(This->buffer_type_hint, 0, This->resource.size, This->resource.allocatedMemory));

1 0

Henri Verbeet : wined3d: Remove a redundant flag in IWineD3DSurfaceImpl_SetMem().
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 4dc28005eb94da48a1bf01702b372e05aa802f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc28005eb94da48a1bf01702… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:28 2010 +0100 wined3d: Remove a redundant flag in IWineD3DSurfaceImpl_SetMem(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 69a9efd..fa715b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2612,7 +2612,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M This->resource.heapMemory = NULL; } This->resource.allocatedMemory = Mem; - This->flags |= SFLAG_USERPTR | SFLAG_INSYSMEM; + This->flags |= SFLAG_USERPTR; /* Now the surface memory is most up do date. Invalidate drawable and texture */ surface_modify_location(This, SFLAG_INSYSMEM, TRUE);

1 0

Borut Razem : msvcrt: popen: stderr from the child process should not be redirected to the parent' s stdin.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 828fd598b0a9eb94924a0902342fb26c6b2d51c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828fd598b0a9eb94924a09023… Author: Borut Razem <borut.razem(a)siol.net> Date: Mon Nov 15 22:50:23 2010 +0100 msvcrt: popen: stderr from the child process should not be redirected to the parent's stdin. --- dlls/msvcrt/process.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b4c39c1..3e2e15e 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1031,7 +1031,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc { MSVCRT_FILE *ret; BOOL readPipe = TRUE; - int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fdStdErr = -1; + int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1; const MSVCRT_wchar_t *p; MSVCRT_wchar_t *comspec, *fullcmd; unsigned int len; @@ -1073,13 +1073,6 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc goto error; if (MSVCRT__dup2(fds[fdToDup], fdToDup) != 0) goto error; - if (readPipe) - { - if ((fdStdErr = MSVCRT__dup(MSVCRT_STDERR_FILENO)) == -1) - goto error; - if (MSVCRT__dup2(fds[fdToDup], MSVCRT_STDERR_FILENO) != 0) - goto error; - } MSVCRT__close(fds[fdToDup]); @@ -1106,16 +1099,10 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc HeapFree(GetProcessHeap(), 0, fullcmd); MSVCRT__dup2(fdStdHandle, fdToDup); MSVCRT__close(fdStdHandle); - if (readPipe) - { - MSVCRT__dup2(fdStdErr, MSVCRT_STDERR_FILENO); - MSVCRT__close(fdStdErr); - } return ret; error: if (fdStdHandle != -1) MSVCRT__close(fdStdHandle); - if (fdStdErr != -1) MSVCRT__close(fdStdErr); MSVCRT__close(fds[0]); MSVCRT__close(fds[1]); return NULL;

1 0

Eric Pouech : msvcrt: Use the macros for parameter checking for wcsncat_s ( and fix the test).
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: d38196a0ffe8fcaf74e73838ea3b3544735ec835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38196a0ffe8fcaf74e73838e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 22:00:10 2010 +0100 msvcrt: Use the macros for parameter checking for wcsncat_s (and fix the test). --- dlls/msvcr90/tests/msvcr90.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 8 +++++ dlls/msvcrt/wcs.c | 13 ++++++--- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 6b0363f..1a94182 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -64,6 +64,7 @@ static char** (__cdecl *p__sys_errlist)(void); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); +static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static void* (WINAPI *pEncodePointer)(void *); @@ -384,6 +385,62 @@ static void test__itoa_s(void) buffer); } +static void test_wcsncat_s(void) +{ + static wchar_t abcW[] = {'a','b','c',0}; + int ret; + wchar_t dst[4]; + wchar_t src[4]; + + if (!p_wcsncat_s) + { + win_skip("skipping wcsncat_s tests\n"); + return; + } + + if(!p_set_invalid_parameter_handler) { + win_skip("_set_invalid_parameter_handler not found\n"); + return; + } + + memcpy(src, abcW, sizeof(abcW)); + dst[0] = 0; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(NULL, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 0, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 0, src, _TRUNCATE); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + ret = p_wcsncat_s(dst, 4, NULL, 0); + ok(ret == 0, "err = %d\n", ret); + + dst[0] = 0; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 2, src, 4); + ok(ret == ERANGE, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + dst[0] = 0; + ret = p_wcsncat_s(dst, 2, src, _TRUNCATE); + ok(ret == STRUNCATE, "err = %d\n", ret); + ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_w(dst)); + + memcpy(dst, abcW, sizeof(abcW)); + dst[3] = 'd'; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); +} /* ########## */ @@ -415,6 +472,7 @@ START_TEST(msvcr90) p_strtoi64 = (void *) GetProcAddress(hcrt, "_strtoi64"); p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); p_itoa_s = (void *)GetProcAddress(hcrt, "_itoa_s"); + p_wcsncat_s = (void *)GetProcAddress( hcrt,"wcsncat_s" ); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -424,4 +482,5 @@ START_TEST(msvcr90) test_error_messages(); test__strtoi64(); test__itoa_s(); + test_wcsncat_s(); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index aa57b31..2a5d4fc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1459,6 +1459,10 @@ static void test_wcsncat_s(void) return; } + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + memcpy(src, abcW, sizeof(abcW)); dst[0] = 0; ret = p_wcsncat_s(NULL, 4, src, 4); @@ -1483,6 +1487,10 @@ static void test_wcsncat_s(void) dst[3] = 'd'; ret = p_wcsncat_s(dst, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); } static void test__mbsnbcat_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 922e9d3..484679f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1634,11 +1634,12 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, MSVCRT_wchar_t dststart; INT ret = 0; - if (src == NULL && count > 0) - return MSVCRT_EINVAL; - if (dst == NULL) + if (!MSVCRT_CHECK_PMT(dst != NULL) || !MSVCRT_CHECK_PMT(elem > 0)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; - if (elem == 0) + } + if (!MSVCRT_CHECK_PMT(src != NULL || count == 0)) return MSVCRT_EINVAL; if (count == 0) return 0; @@ -1649,7 +1650,10 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, break; } if (dststart == elem) + { + MSVCRT_INVALID_PMT("dst[elem] is not NULL terminated\n"); return MSVCRT_EINVAL; + } if (count == MSVCRT__TRUNCATE) { @@ -1668,6 +1672,7 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, dst[srclen] = '\0'; return ret; } + MSVCRT_INVALID_PMT("dst[elem] is too small"); dst[0] = '\0'; return MSVCRT_ERANGE; }

1 0

Eric Pouech : msvcrt: Implemented _i64to[aw]_s.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: beca1d73a89a2ca8abb0d52e8448b9d9328b25ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=beca1d73a89a2ca8abb0d52e8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 22:00:01 2010 +0100 msvcrt: Implemented _i64to[aw]_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/string.c | 156 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 164 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4d26904..28243de 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -731,9 +731,9 @@ @ cdecl _hypot(double double) msvcrt._hypot @ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa -@ stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) msvcrt._i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow -@ stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm @ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a65a89d..9206b93 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -578,9 +578,9 @@ @ cdecl _hypot(double double) msvcrt._hypot @ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa -@ stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) msvcrt._i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow -@ stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm @ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 64332f5..c58637d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -566,9 +566,9 @@ @ cdecl _hypot(double double) msvcrt._hypot @ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa -@ stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) msvcrt._i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow -@ stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm @ cdecl _initterm_e(ptr ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 00ba5ea..c73a132 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -515,9 +515,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -# stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) _i64toa_s @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -# stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) _i64tow_s @ cdecl _initterm(ptr ptr) # stub _initterm_e @ stub _inp #(long) -i386 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d807c14..11ad5a0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -972,6 +972,162 @@ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix) return 0; } +/********************************************************************* + * _i64toa_s (MSVCRT.@) + */ +int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix) +{ + unsigned __int64 val; + unsigned int digit; + int is_negative; + char buffer[65], *pos; + size_t len; + + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix >= 2) || !MSVCRT_CHECK_PMT(radix <= 36)) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 64; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 65 - pos; + if (len > size) + { + size_t i; + char *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 63, i = 0; i < size; i++) + *p++ = *pos--; + + str[0] = '\0'; + MSVCRT_INVALID_PMT("str[size] is too small"); + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len); + return 0; +} + +/********************************************************************* + * _i64tow_s (MSVCRT.@) + */ +int CDECL _i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +{ + unsigned __int64 val; + unsigned int digit; + int is_negative; + MSVCRT_wchar_t buffer[65], *pos; + size_t len; + + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix >= 2) || !MSVCRT_CHECK_PMT(radix <= 36)) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 64; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 65 - pos; + if (len > size) + { + size_t i; + MSVCRT_wchar_t *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 63, i = 0; i < size; i++) + *p++ = *pos--; + + MSVCRT_INVALID_PMT("str[size] is too small"); + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len * sizeof(MSVCRT_wchar_t)); + return 0; +} + #define I10_OUTPUT_MAX_PREC 21 /* Internal structure used by $I10_OUTPUT */ struct _I10_OUTPUT_DATA {

1 0

Eric Pouech : msvcrt: Implemented _ltoa_s.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 28884a8faacc2cd832e7db86abc1c072ef51e97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28884a8faacc2cd832e7db86a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 21:59:55 2010 +0100 msvcrt: Implemented _ltoa_s. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 30 ++++++++++++++++++++++++------ 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 08942ae..4d26904 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -862,9 +862,9 @@ @ cdecl _lseek(long long long) msvcrt._lseek @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64 @ cdecl _ltoa(long ptr long) msvcrt._ltoa -@ stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) msvcrt._ltoa_s @ cdecl _ltow(long ptr long) msvcrt._ltow -@ stub _ltow_s +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s @ cdecl _malloc_crt(long) msvcrt.malloc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2052fde..a65a89d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -708,9 +708,9 @@ @ cdecl _lseek(long long long) msvcrt._lseek @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64 @ cdecl _ltoa(long ptr long) msvcrt._ltoa -@ stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) msvcrt._ltoa_s @ cdecl _ltow(long ptr long) msvcrt._ltow -@ stub _ltow_s +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s @ cdecl _malloc_crt(long) msvcrt.malloc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2fde5eb..64332f5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -696,9 +696,9 @@ @ cdecl _lseek(long long long) msvcrt._lseek @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64 @ cdecl _ltoa(long ptr long) msvcrt._ltoa -@ stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) msvcrt._ltoa_s @ cdecl _ltow(long ptr long) msvcrt._ltow -@ stub _ltow_s +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s @ cdecl _malloc_crt(long) msvcrt.malloc diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9602f3d..00ba5ea 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -639,9 +639,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -# stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) ntdll._ltoa_s @ cdecl _ltow(long ptr long) ntdll._ltow -# stub _ltow_s +@ cdecl _ltow_s(long ptr long long) ntdll._ltow_s @ cdecl _makepath(ptr str str str str) @ cdecl _makepath_s(ptr long str str str str) # stub _malloc_dbg diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d657fc3..d807c14 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -709,11 +709,12 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas } /********************************************************************* - * _itoa_s (MSVCRT.@) + * _ltoa_s (MSVCRT.@) */ -int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) +int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { - unsigned int val, digit; + MSVCRT_ulong val; + unsigned int digit; int is_negative; char buffer[33], *pos; size_t len; @@ -786,11 +787,12 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* - * _itow_s (MSVCRT.@) + * _ltow_s (MSVCRT.@) */ -int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) { - unsigned int val, digit; + MSVCRT_ulong val; + unsigned int digit; int is_negative; MSVCRT_wchar_t buffer[33], *pos; size_t len; @@ -863,6 +865,22 @@ int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itoa_s (MSVCRT.@) + */ +int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) +{ + return _ltoa_s(value, str, size, radix); +} + +/********************************************************************* + * _itow_s (MSVCRT.@) + */ +int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +{ + return _ltow_s(value, str, size, radix); +} + +/********************************************************************* * _ui64toa_s (MSVCRT.@) */ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str,

1 0

Eric Pouech : wineconsole: In curses mode, map some box drawing attributes to ACS characters.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 4a1d9c3b55efb1638eb6a6ecb8cd1e38dfd135aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1d9c3b55efb1638eb6a6ecb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 21:36:14 2010 +0100 wineconsole: In curses mode, map some box drawing attributes to ACS characters. --- programs/wineconsole/curses.c | 75 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 71 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 35c5907..172ac47 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -124,6 +124,7 @@ MAKE_FUNCPTR(wgetch) MAKE_FUNCPTR(mouseinterval) MAKE_FUNCPTR(mousemask) #endif +MAKE_FUNCPTR(acs_map) #undef MAKE_FUNCPTR @@ -187,6 +188,7 @@ static BOOL WCCURSES_bind_libcurses(void) LOAD_FUNCPTR(mouseinterval) LOAD_FUNCPTR(mousemask) #endif + LOAD_FUNCPTR(acs_map) #undef LOAD_FUNCPTR @@ -235,6 +237,7 @@ sym_not_found: #define waddchnstr p_waddchnstr #define wmove p_wmove #define wgetch p_wgetch +#define acs_map (*p_acs_map) /****************************************************************** * WCCURSES_ResizeScreenBuffer @@ -358,16 +361,80 @@ static void WCCURSES_Refresh(const struct inner_data* data, int tp, int bm) int y; CHAR_INFO* cell; DWORD attr; - char ch; for (y = tp; y <= bm; y++) { cell = &data->cells[y * data->curcfg.sb_width]; for (x = 0; x < data->curcfg.sb_width; x++) { - WideCharToMultiByte(CP_UNIXCP, 0, &cell[x].Char.UnicodeChar, 1, - &ch, 1, NULL, NULL); - attr = ((BYTE)ch < 32) ? 32 : (BYTE)ch; + /* check for some mapping to ACS characters (drawing boxes, arrows) */ + if ((cell[x].Char.UnicodeChar >= 0x2500 && cell[x].Char.UnicodeChar <= 0x257F) || + (cell[x].Char.UnicodeChar >= 0x2190 && cell[x].Char.UnicodeChar <= 0x21FF)) + { + /* FIXME: we're also mapping heavy and lines item to single lines + * (that's ugly, but that's better than crap) + * Moreover, as the ACS_ macros refer to values in array acs_map[], we + * cannot simply build static tables for the mapping (FIXME: this could be done + * at load time) + */ + switch (cell[x].Char.UnicodeChar) + { + case 0x2190: case 0x219E: case 0x21A2: case 0x21A4: + case 0x21BC: case 0x21BD: case 0x21D0: case 0x21E6: attr = ACS_LARROW; break; + case 0x2191: case 0x219F: case 0x21A3: case 0x21A5: + case 0x21BE: case 0x21BF: case 0x21D1: case 0x21E7: attr = ACS_UARROW; break; + case 0x2192: case 0x21A0: case 0x21A6: case 0x21C0: + case 0x21C1: case 0x21D2: case 0x21E8: attr = ACS_RARROW; break; + case 0x2193: case 0x21A1: case 0x21A7: case 0x21C2: + case 0x21C3: case 0x21D3: case 0x21E9: attr = ACS_DARROW; break; + + case 0x2500: case 0x2501: case 0x257C: case 0x257E: attr = ACS_HLINE; break; + case 0x2502: case 0x2503: case 0x257D: case 0x257F: attr = ACS_VLINE; break; + case 0x250C: case 0x250D: case 0x250E: case 0x250F: attr = ACS_ULCORNER; break; + case 0x2510: case 0x2511: case 0x2512: case 0x2513: attr = ACS_URCORNER; break; + case 0x2514: case 0x2515: case 0x2516: case 0x2517: attr = ACS_LLCORNER; break; + case 0x2518: case 0x2519: case 0x251A: case 0x251B: attr = ACS_LRCORNER; break; + case 0x251C: case 0x251D: case 0x251E: case 0x251F: + case 0x2520: case 0x2521: case 0x2522: case 0x2523: attr = ACS_LTEE; break; + case 0x2524: case 0x2525: case 0x2526: case 0x2527: + case 0x2528: case 0x2529: case 0x252A: case 0x252B: attr = ACS_RTEE; break; + + case 0x252C: case 0x252D: case 0x252E: case 0x252F: + case 0x2530: case 0x2531: case 0x2532: case 0x2533: attr = ACS_TTEE; break; + case 0x2534: case 0x2535: case 0x2536: case 0x2537: + case 0x2538: case 0x2539: case 0x253A: case 0x253B: attr = ACS_BTEE; break; + + case 0x253C: case 0x253D: case 0x253E: case 0x253F: + case 0x2540: case 0x2541: case 0x2542: case 0x2543: + case 0x2544: case 0x2545: case 0x2546: case 0x2547: + case 0x2548: case 0x2549: case 0x254A: case 0x254B: attr = ACS_PLUS; break; + + case 0x2550: attr = ACS_HLINE; break; + case 0x2551: attr = ACS_VLINE; break; + case 0x2552: case 0x2553: case 0x2554: attr = ACS_ULCORNER; break; + case 0x2555: case 0x2556: case 0x2557: attr = ACS_URCORNER; break; + case 0x2558: case 0x2559: case 0x255A: attr = ACS_LLCORNER; break; + case 0x255B: case 0x255C: case 0x255D: attr = ACS_LRCORNER; break; + case 0x255E: case 0x255F: case 0x2560: attr = ACS_LTEE; break; + case 0x2561: case 0x2562: case 0x2563: attr = ACS_RTEE; break; + case 0x2564: case 0x2565: case 0x2566: attr = ACS_TTEE; break; + case 0x2567: case 0x2568: case 0x2569: attr = ACS_BTEE; break; + case 0x256A: case 0x256B: case 0x256C: attr = ACS_PLUS; break; + default: + WINE_FIXME("Unmapped special character (%x)\n", cell[x].Char.UnicodeChar); + attr = ' '; + } + } + else + { + char ch[2]; + + if (WideCharToMultiByte(CP_UNIXCP, 0, &cell[x].Char.UnicodeChar, 1, + ch, sizeof(ch), NULL, NULL) == 1) + attr = ((BYTE)ch[0] < 32) ? 32 : (BYTE)ch[0]; + else + attr = 32; + } if (cell[x].Attributes & FOREGROUND_RED) attr |= COLOR_PAIR(COLOR_RED); if (cell[x].Attributes & FOREGROUND_BLUE) attr |= COLOR_PAIR(COLOR_BLUE);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
87
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 November 2010