wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Nikolay Sivov : comctl32/imagelist: Fix failure code for IImageList_Remove( ).
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 4023e0125fe49d477186445b7f35caa690dc2cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4023e0125fe49d477186445b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 10:13:43 2010 +0400 comctl32/imagelist: Fix failure code for IImageList_Remove(). --- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/tests/imagelist.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index c37c7a0..f0652e5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3314,7 +3314,7 @@ static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface, static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i) { - return (ImageList_Remove((HIMAGELIST) iface, i) == 0) ? E_FAIL : S_OK; + return (ImageList_Remove((HIMAGELIST) iface, i) == 0) ? E_INVALIDARG : S_OK; } static HRESULT WINAPI ImageListImpl_GetIcon(IImageList *iface, int i, UINT flags, diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 191b796..a8e31da 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1493,7 +1493,7 @@ static void test_IImageList_Add_Remove(void) /* remove when nothing exists */ hr = IImageList_Remove(imgl, 0); - todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); /* removing everything from an empty imagelist should succeed */ hr = IImageList_Remove(imgl, -1); @@ -1505,7 +1505,7 @@ static void test_IImageList_Add_Remove(void) ok( IImageList_ReplaceIcon(imgl, -1, hicon3, &ret) == S_OK && (ret == 2),"failed to add icon3\n"); /* remove an index out of range */ - todo_wine ok( IImageList_Remove(imgl, 4711) == E_INVALIDARG, "got 0x%08x\n", hr); + ok( IImageList_Remove(imgl, 4711) == E_INVALIDARG, "got 0x%08x\n", hr); /* remove three */ ok( IImageList_Remove(imgl,0) == S_OK, "can't remove 0\n"); @@ -1513,7 +1513,7 @@ static void test_IImageList_Add_Remove(void) ok( IImageList_Remove(imgl,0) == S_OK, "can't remove 0\n"); /* remove one extra */ - todo_wine ok( IImageList_Remove(imgl, 0) == E_INVALIDARG, "got 0x%08x\n", hr); + ok( IImageList_Remove(imgl, 0) == E_INVALIDARG, "got 0x%08x\n", hr); IImageList_Release(imgl); ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n");

1 0

Nikolay Sivov : comctl32/imagelist: Fix failure code for IImageList_Draw().
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 5ee4441c15fd57348a149e1a71bbbca87b14e9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee4441c15fd57348a149e1a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 09:42:44 2010 +0400 comctl32/imagelist: Fix failure code for IImageList_Draw(). --- dlls/comctl32/imagelist.c | 9 +++------ dlls/comctl32/tests/imagelist.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 47279c9..c37c7a0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3298,11 +3298,8 @@ static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface, IMAGELISTDRAWPARAMS *pimldp) { HIMAGELIST This = (HIMAGELIST) iface; - HIMAGELIST old_himl = 0; - int ret = 0; - - if (!pimldp) - return E_FAIL; + HIMAGELIST old_himl; + int ret; /* As far as I can tell, Windows simply ignores the contents of pimldp->himl so we shall simulate the same */ @@ -3312,7 +3309,7 @@ static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface, ret = ImageList_DrawIndirect(pimldp); pimldp->himl = old_himl; - return ret ? S_OK : E_FAIL; + return ret ? S_OK : E_INVALIDARG; } static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index de6d2c3..191b796 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1596,9 +1596,15 @@ static void test_IImageList_Draw(void) ok( IImageList_SetImageCount(imgl, 3) == S_OK, "Setimage count failed\n"); ok( IImageList_Replace(imgl, 2, hbm3, 0) == S_OK, "failed to replace bitmap 3\n"); +if (0) +{ + /* crashes on native */ + hr = IImageList_Draw(imgl, NULL); +} + memset(&imldp, 0, sizeof (imldp)); hr = IImageList_Draw(imgl, &imldp); - todo_wine ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); imldp.cbSize = IMAGELISTDRAWPARAMS_V3_SIZE; imldp.hdcDst = hdc; @@ -1618,7 +1624,7 @@ static void test_IImageList_Draw(void) imldp.i ++; ok( IImageList_Draw(imgl, &imldp) == S_OK, "should succeed\n"); imldp.i ++; - todo_wine ok( IImageList_Draw(imgl, &imldp) == E_INVALIDARG, "should fail\n"); + ok( IImageList_Draw(imgl, &imldp) == E_INVALIDARG, "should fail\n"); /* remove three */ ok( IImageList_Remove(imgl, 0) == S_OK, "removing 1st bitmap\n");

1 0

Nikolay Sivov : comctl32/tests: Use reduced IMAGELISTDRAWPARAMS structure size for tests.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 33ee0cae46f98842c26d803478e38ffc272625c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ee0cae46f98842c26d80347… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 09:38:36 2010 +0400 comctl32/tests: Use reduced IMAGELISTDRAWPARAMS structure size for tests. --- dlls/comctl32/tests/imagelist.c | 18 +++--------------- include/commctrl.h | 3 ++- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 88e159b..de6d2c3 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -447,17 +447,12 @@ static void test_DrawIndirect(void) memset(&imldp, 0, sizeof (imldp)); ok(!pImageList_DrawIndirect(&imldp), "zero data succeeded!\n"); - imldp.cbSize = sizeof (imldp); + imldp.cbSize = IMAGELISTDRAWPARAMS_V3_SIZE; ok(!pImageList_DrawIndirect(&imldp), "zero hdc succeeded!\n"); imldp.hdcDst = hdc; ok(!pImageList_DrawIndirect(&imldp),"zero himl succeeded!\n"); imldp.himl = himl; - if (!pImageList_DrawIndirect(&imldp)) - { - /* Earlier versions of native comctl32 use a smaller structure */ - imldp.cbSize -= 3 * sizeof(DWORD); - ok(pImageList_DrawIndirect(&imldp),"DrawIndirect should succeed\n"); - } + REDRAW(hwndfortest); WAIT; @@ -1605,17 +1600,10 @@ static void test_IImageList_Draw(void) hr = IImageList_Draw(imgl, &imldp); todo_wine ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); - imldp.cbSize = sizeof (imldp); + imldp.cbSize = IMAGELISTDRAWPARAMS_V3_SIZE; imldp.hdcDst = hdc; imldp.himl = himl; - if (FAILED(IImageList_Draw(imgl, &imldp))) - { - /* Earlier versions of native comctl32 use a smaller structure */ - imldp.cbSize -= 3 * sizeof(DWORD); - ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); - } - REDRAW(hwndfortest); WAIT; diff --git a/include/commctrl.h b/include/commctrl.h index fdd6951..e7d0ab4 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -580,9 +580,10 @@ typedef struct _IMAGELISTDRAWPARAMS DWORD dwRop; DWORD fState; DWORD Frame; - DWORD crEffect; + COLORREF crEffect; } IMAGELISTDRAWPARAMS, *LPIMAGELISTDRAWPARAMS; +#define IMAGELISTDRAWPARAMS_V3_SIZE CCSIZEOF_STRUCT(IMAGELISTDRAWPARAMS, dwRop) HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST,REFIID,void **); INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);

1 0

Nikolay Sivov : comctl32/tests: Use better names for test functions, discover some new test failures.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 4d6c30f90f3ef8ef35b41c67853bae296cc2e107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6c30f90f3ef8ef35b41c678… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 09:32:09 2010 +0400 comctl32/tests: Use better names for test functions, discover some new test failures. --- dlls/comctl32/tests/imagelist.c | 228 +++++++++++++++++++------------------- 1 files changed, 114 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d6c30f90f3ef8ef35b41…

1 0

Rico Schüller : d3dcompiler: Add D3DCreateBlob() test.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 5ad7f7b9d3d31a11ba7acbd3be837027e674125e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad7f7b9d3d31a11ba7acbd3b… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 19 21:33:43 2010 +0200 d3dcompiler: Add D3DCreateBlob() test. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_43/tests/Makefile.in | 11 ++++++ dlls/d3dcompiler_43/tests/blob.c | 58 +++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 1dbeee8..648a9d4 100755 --- a/configure +++ b/configure @@ -14464,6 +14464,7 @@ wine_fn_config_dll d3dcompiler_40 enable_d3dcompiler_40 wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler +wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test wine_fn_config_dll d3dim enable_d3dim d3dim wine_fn_config_dll d3drm enable_d3drm d3drm wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index d888063..5b8a199 100644 --- a/configure.ac +++ b/configure.ac @@ -2303,6 +2303,7 @@ WINE_CONFIG_DLL(d3dcompiler_40) WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) +WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dim,,[d3dim]) WINE_CONFIG_DLL(d3drm,,[d3drm]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in new file mode 100644 index 0000000..11345c5 --- /dev/null +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = d3dcompiler_43.dll +IMPORTS = d3dcompiler + +C_SRCS = \ + blob.c + +@MAKE_TEST_RULES@ diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c new file mode 100644 index 0000000..a9eee7f --- /dev/null +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -0,0 +1,58 @@ +/* + * Copyright 2010 Rico Schüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * Nearly all compiler functions need the shader blob and the size. The size + * is always located at DWORD #6 in the shader blob (blob[6]). + * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect + */ + +#define COBJMACROS +#include "d3dcompiler.h" +#include "wine/test.h" + +/* + * This doesn't belong here, but for some functions it is possible to return that value, + * see http://msdn.microsoft.com/en-us/library/bb205278%28v=VS.85%29.aspx + * The original definition is in D3DX10core.h. + */ +#define D3DERR_INVALIDCALL 0x8876086c + +static void test_create_blob(void) +{ + ID3D10Blob *blob; + HRESULT hr; + ULONG refcount; + + hr = D3DCreateBlob(1, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + + hr = D3DCreateBlob(0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + + hr = D3DCreateBlob(0, &blob); + ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + + refcount = blob->lpVtbl->Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); +} + +START_TEST(blob) +{ + test_create_blob(); +}

1 0

Rico Schüller : d3dcompiler: Add D3DCreateBlob() declaration.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 12d14c695f4abd948209086647be0e0cf3f567ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d14c695f4abd94820908664… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 19 21:33:32 2010 +0200 d3dcompiler: Add D3DCreateBlob() declaration. --- include/d3dcompiler.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 27ed290..1939124 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -41,4 +41,6 @@ #define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 #define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); + #endif

1 0

Detlef Riekenberg : ntdll/tests: Add tests for RtlIpv4AddressToString / RtlIpv4AddressToStringEx.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 0fa0d17d67aea5aaa3f0463f063305574667db77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa0d17d67aea5aaa3f0463f0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 20 05:50:19 2010 +0200 ntdll/tests: Add tests for RtlIpv4AddressToString / RtlIpv4AddressToStringEx. --- dlls/ntdll/tests/rtl.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 187 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 8a83feb..5059714 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include "ntdll_test.h" +#include "inaddr.h" #ifndef __WINE_WINTERNL_H @@ -45,6 +46,20 @@ typedef struct _RTL_HANDLE_TABLE #endif +/* avoid #include <winsock2.h> */ +#undef htons +#ifdef WORDS_BIGENDIAN +#define htons(s) ((USHORT)(s)) +#else /* WORDS_BIGENDIAN */ +static inline USHORT __my_ushort_swap(USHORT s) +{ + return (s >> 8) | (s << 8); +} +#define htons(s) __my_ushort_swap(s) +#endif /* WORDS_BIGENDIAN */ + + + /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static SIZE_T (WINAPI *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T); @@ -70,9 +85,12 @@ static NTSTATUS (WINAPI *pRtlFreeSid)(PSID); static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); +static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR); +static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); +static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); + static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); -static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR); #define LEN 16 @@ -111,6 +129,8 @@ static void InitFunctionPtrs(void) pRtlGetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlGetThreadErrorMode"); pRtlSetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlSetThreadErrorMode"); pLdrProcessRelocationBlock = (void *)GetProcAddress(hntdll, "LdrProcessRelocationBlock"); + pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); + pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1129,6 +1149,170 @@ static void test_LdrProcessRelocationBlock(void) ok(addr16 == 0x565, "addr16 = %x, expected 0x565\n", addr16); } +static void test_RtlIpv4AddressToString(void) +{ + CHAR buffer[20]; + CHAR *res; + IN_ADDR ip; + DWORD len; + + if (!pRtlIpv4AddressToStringA) + { + win_skip("RtlIpv4AddressToStringA not available\n"); + return; + } + + ip.S_un.S_un_b.s_b1 = 1; + ip.S_un.S_un_b.s_b2 = 2; + ip.S_un.S_un_b.s_b3 = 3; + ip.S_un.S_un_b.s_b4 = 4; + + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringA(&ip, buffer); + len = strlen(buffer); + ok(res == (buffer + len), "got %p with '%s' (expected %p)\n", res, buffer, buffer + len); + + res = pRtlIpv4AddressToStringA(&ip, NULL); + ok( (res == (char *)~0) || + broken(res == (char *)0 + len), /* XP and w2003 */ + "got %p (expected ~0)\n", res); + + if (0) { + /* this crashes in windows */ + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringA(NULL, buffer); + trace("got %p with '%s'\n", res, buffer); + } + + if (0) { + /* this crashes in windows */ + res = pRtlIpv4AddressToStringA(NULL, NULL); + trace("got %p\n", res); + } +} + +static void test_RtlIpv4AddressToStringEx(void) +{ + CHAR ip_1234[] = "1.2.3.4"; + CHAR ip_1234_80[] = "1.2.3.4:80"; + LPSTR expect; + CHAR buffer[30]; + NTSTATUS res; + IN_ADDR ip; + ULONG size; + DWORD used; + USHORT port; + + if (!pRtlIpv4AddressToStringExA) + { + win_skip("RtlIpv4AddressToStringExA not available\n"); + return; + } + + ip.S_un.S_un_b.s_b1 = 1; + ip.S_un.S_un_b.s_b2 = 2; + ip.S_un.S_un_b.s_b3 = 3; + ip.S_un.S_un_b.s_b4 = 4; + + port = htons(80); + expect = ip_1234_80; + + size = sizeof(buffer); + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + used = strlen(buffer); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used + 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + size = used - 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + + /* to get only the ip, use 0 as port */ + port = 0; + expect = ip_1234; + + size = sizeof(buffer); + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + used = strlen(buffer); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used + 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + size = used - 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + + /* parameters are checked */ + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, 0, buffer, NULL); + ok(res == STATUS_INVALID_PARAMETER, + "got 0x%x with '%s' (expected STATUS_INVALID_PARAMETER)\n", res, buffer); + + size = sizeof(buffer); + res = pRtlIpv4AddressToStringExA(&ip, 0, NULL, &size); + ok( res == STATUS_INVALID_PARAMETER, + "got 0x%x and size %d (expected STATUS_INVALID_PARAMETER)\n", res, size); + + size = sizeof(buffer); + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(NULL, 0, buffer, &size); + ok( res == STATUS_INVALID_PARAMETER, + "got 0x%x and size %d with '%s' (expected STATUS_INVALID_PARAMETER)\n", + res, size, buffer); +} + + START_TEST(rtl) { InitFunctionPtrs(); @@ -1150,4 +1334,6 @@ START_TEST(rtl) test_RtlDeleteTimer(); test_RtlThreadErrorMode(); test_LdrProcessRelocationBlock(); + test_RtlIpv4AddressToString(); + test_RtlIpv4AddressToStringEx(); }

1 0

Nikolay Sivov : comctl32/listview: Fix infinite loop case for full item range as a first search range.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: ce5a06c1b0428347048f9b37f96a3fda0dceef47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5a06c1b0428347048f9b37f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 11:03:25 2010 +0400 comctl32/listview: Fix infinite loop case for full item range as a first search range. --- dlls/comctl32/listview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6dbcf4a..11d8d98 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1849,8 +1849,9 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L } } - /* found something or second search completed with any result */ - if (nItem != -1 || endidx != infoPtr->nItemCount) + if ( nItem != -1 || /* found something */ + endidx != infoPtr->nItemCount || /* second search done */ + (startidx == 0 && endidx == infoPtr->nItemCount) /* full range for first search */ ) break; }; }

1 0

Marko Nikolic : advpack/tests: Removed sign comparison warning in advpack tests.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 78b020c018750a7032b9daadc75daa1035f54d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b020c018750a7032b9daadc… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Thu Aug 19 23:33:02 2010 +0200 advpack/tests: Removed sign comparison warning in advpack tests. --- dlls/advpack/tests/advpack.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 3ead0f2..1345d72 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -130,7 +130,7 @@ static void delnode_test(void) HRESULT hr; HANDLE hn; CHAR currDir[MAX_PATH]; - int currDirLen; + UINT currDirLen; /* Native DelNode apparently does not support relative paths, so we use absolute paths for testing */ @@ -446,7 +446,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); - ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); memset(buffer, 'a', APP_PATH_LEN); @@ -457,7 +457,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); - ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); { @@ -473,7 +473,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, drive), "Expected %s, got %s\n", drive, buffer); - ok(size == lstrlenA(drive)+1, "Expected size %d, got %d\n", + ok(size == strlen(drive)+1, "Expected size %d, got %d\n", lstrlenA(drive)+1, size); } @@ -531,7 +531,7 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpi(buffer, PROG_FILES_ROOT), "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); - ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + ok(size == strlen(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); /* close the INF again */

1 0

Piotr Caban : msvcp90: Added _String_base::Xran implementation.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: d7938822f75ea113039e5bd2e79966f3d256f698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7938822f75ea113039e5bd2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 23:49:18 2010 +0200 msvcp90: Added _String_base::Xran implementation. --- dlls/msvcp90/exception.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 3 +- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/string.c | 13 +++++- 4 files changed, 112 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index d795b66..b4c8bff 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -101,6 +101,7 @@ void CDECL _CxxThrowException(exception*,const cxx_exception_type*); extern const vtable_ptr MSVCP_bad_alloc_vtable; extern const vtable_ptr MSVCP_logic_error_vtable; extern const vtable_ptr MSVCP_length_error_vtable; +extern const vtable_ptr MSVCP_out_of_range_vtable; /* exception class data */ static type_info exception_type_info = { @@ -519,12 +520,104 @@ static const cxx_exception_type length_error_cxx_type = { &length_error_cxx_type_table }; +/* out_of_range class data */ +typedef logic_error out_of_range; + +DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor, 8) +out_of_range* __stdcall MSVCP_out_of_range_ctor( + out_of_range *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + MSVCP_logic_error_ctor(this, name); + this->e.vtable = &MSVCP_out_of_range_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_copy_ctor, 8) +out_of_range* __stdcall MSVCP_out_of_range_copy_ctor( + out_of_range *this, out_of_range *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_logic_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_out_of_range_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_vector_dtor, 8) +void* __stdcall MSVCP_out_of_range_vector_dtor( + out_of_range *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + return MSVCP_logic_error_vector_dtor(this, flags); +} + +static const type_info out_of_range_type_info = { + &MSVCP_out_of_range_vtable, + NULL, + ".?AVout_of_range@std@@" +}; + +static const rtti_base_descriptor out_of_range_rtti_base_descriptor = { + &out_of_range_type_info, + 2, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array out_of_range_rtti_base_array = { + { + &out_of_range_rtti_base_descriptor, + &logic_error_rtti_base_descriptor, + &exception_rtti_base_descriptor + } +}; + +static const rtti_object_hierarchy out_of_range_type_hierarchy = { + 0, + 0, + 3, + &out_of_range_rtti_base_array +}; + +const rtti_object_locator out_of_range_rtti = { + 0, + 0, + 0, + &out_of_range_type_info, + &out_of_range_type_hierarchy +}; + +static const cxx_type_info out_of_range_cxx_type_info = { + 0, + &out_of_range_type_info, + { 0, -1, 0 }, + sizeof(out_of_range), + (cxx_copy_ctor)THISCALL(MSVCP_out_of_range_copy_ctor) +}; + +static const cxx_type_info_table out_of_range_cxx_type_table = { + 3, + { + &out_of_range_cxx_type_info, + &logic_error_cxx_type_info, + &exception_cxx_type_info + } +}; + +static const cxx_exception_type out_of_range_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_logic_error_dtor), + NULL, + &out_of_range_cxx_type_table +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif __ASM_EXCEPTION_VTABLE(bad_alloc) __ASM_EXCEPTION_STRING_VTABLE(logic_error) __ASM_EXCEPTION_STRING_VTABLE(length_error) + __ASM_EXCEPTION_STRING_VTABLE(out_of_range) #ifndef __GNUC__ } #endif @@ -559,5 +652,10 @@ void throw_exception(exception_type et, const char *str) _CxxThrowException((exception*)&e, &length_error_cxx_type); return; } + case EXCEPTION_OUT_OF_RANGE: { + out_of_range e; + MSVCP_out_of_range_ctor(&e, &addr); + _CxxThrowException((exception*)&e, &out_of_range_cxx_type); + } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3c43117..bc3c73d 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -61,7 +61,8 @@ typedef enum __exception_type { EXCEPTION, EXCEPTION_BAD_ALLOC, EXCEPTION_LOGIC_ERROR, - EXCEPTION_LENGTH_ERROR + EXCEPTION_LENGTH_ERROR, + EXCEPTION_OUT_OF_RANGE } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4a442c6..898cac5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2881,7 +2881,7 @@ @ cdecl ?_Xlen@_String_base@std@@SAXXZ() MSVCP__String_base_Xlen @ stub ?_Xmem@tr1@std@@YAXXZ @ stub ?_Xoutrange@tr1@std@@YAXXZ -@ stub ?_Xran@_String_base@std@@SAXXZ +@ cdecl ?_Xran@_String_base@std@@SAXXZ() MSVCP__String_base_Xran @ stub ?_Xran@ctype_base@std@@KAXXZ @ stub -arch=win32 ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADIH@Z @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEAD_K_J@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 3b8fc66..97c47d0 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -476,6 +476,15 @@ void CDECL MSVCP__String_base_Xlen(void) throw_exception(EXCEPTION_LENGTH_ERROR, msg); } +/* ?_Xran@_String_base@std@@SAXXZ */ +void CDECL MSVCP__String_base_Xran(void) +{ + static const char msg[] = "invalid string position"; + + TRACE("\n"); + throw_exception(EXCEPTION_OUT_OF_RANGE, msg); +} + /* basic_string<char, char_traits<char>, allocator<char>> */ /* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB */ @@ -580,7 +589,7 @@ basic_string_char* __stdcall MSVCP_basic_string_char_erase( TRACE("%p %d %d\n", this, pos, len); if(pos > this->size) { - FIXME("Throw exception (_Xran)\n"); + MSVCP__String_base_Xran(); return NULL; } @@ -607,7 +616,7 @@ basic_string_char* __stdcall MSVCP_basic_string_char_assign_substr( TRACE("%p %p %d %d\n", this, assign, pos, len); if(assign->size < pos) { - FIXME("Throw exception (_Xran)\n"); + MSVCP__String_base_Xran(); return NULL; }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
89
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 August 2010