August 2010 - Wine-Commits - list.winehq.org

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

Aug. 20, 2010

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 Aug. 20, 2010

Aug. 20, 2010

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/tests: Use better names for test functions, discover some new test failures.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

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

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

Aug. 20, 2010

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: More imagelist tests to show broken parameter validation.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 8bcdc9ad4372674cdb358d6584801c45589ce9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bcdc9ad4372674cdb358d658… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 10:15:38 2010 +0400 comctl32/tests: More imagelist tests to show broken parameter validation. --- dlls/comctl32/tests/imagelist.c | 58 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a8e31da..b6b509c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1475,7 +1475,7 @@ static void test_IImageList_Add_Remove(void) HICON hicon2; HICON hicon3; - int ret = 0; + int ret; /* create an imagelist to play with */ himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); @@ -1500,8 +1500,11 @@ static void test_IImageList_Add_Remove(void) ok(hr == S_OK, "removed nonexistent icon\n"); /* add three */ + ret = -1; ok( IImageList_ReplaceIcon(imgl, -1, hicon1, &ret) == S_OK && (ret == 0),"failed to add icon1\n"); + ret = -1; ok( IImageList_ReplaceIcon(imgl, -1, hicon2, &ret) == S_OK && (ret == 1),"failed to add icon2\n"); + ret = -1; ok( IImageList_ReplaceIcon(imgl, -1, hicon3, &ret) == S_OK && (ret == 2),"failed to add icon3\n"); /* remove an index out of range */ @@ -1722,6 +1725,57 @@ static void test_IImageList_Merge(void) DestroyWindow(hwnd); } +static void test_iconsize(void) +{ + HIMAGELIST himl; + INT cx, cy; + BOOL ret; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + /* null pointers, not zero imagelist dimensions */ + ret = ImageList_GetIconSize(himl, NULL, NULL); + todo_wine ok(!ret, "got %d\n", ret); + + /* doesn't touch return pointers */ + cx = 0xdeadbeef; + ret = ImageList_GetIconSize(himl, &cx, NULL); +todo_wine { + ok(!ret, "got %d\n", ret); + ok(cx == 0xdeadbeef, "got %d\n", cx); +} + cy = 0xdeadbeef; + ret = ImageList_GetIconSize(himl, NULL, &cy); +todo_wine { + ok(!ret, "got %d\n", ret); + ok(cy == 0xdeadbeef, "got %d\n", cy); +} + ImageList_Destroy(himl); +} + +static void test_create(void) +{ + HIMAGELIST himl; + +todo_wine { + /* list with zero or negative image dimensions */ + himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(0, 16, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(16, 0, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(16, -1, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(-1, 16, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); +} + +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1737,12 +1791,14 @@ START_TEST(imagelist) InitCommonControls(); + test_create(); test_hotspot(); test_add_remove(); test_imagecount(); test_DrawIndirect(); test_merge(); test_imagelist_storage(); + test_iconsize(); FreeLibrary(hComCtl32);

1 0

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

Aug. 20, 2010

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/imagelist: Fix failure code for IImageList_Remove( ).
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

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/listview: Fix infinite loop case for full item range as a first search range.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

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

Piotr Caban : msvcp90: Added basic_string<char> constructor implementation (from cstr).
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 6675d69a0b8dd9cc5a4649bd12e41a2baedb25c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6675d69a0b8dd9cc5a4649bd1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 23:48:36 2010 +0200 msvcp90: Added basic_string<char> constructor implementation (from cstr). --- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index dd565b0..baf6003 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -743,10 +743,10 @@ @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ID@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD0@Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)IDABV?$allocator(a)D@1@@Z -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD@Z +@ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD@Z(ptr str) MSVCP_basic_string_char_ctor_cstr @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBD0@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBDAEBV?$allocator(a)D@1@@Z -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBD@Z +@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBD@Z(str) __thiscall_MSVCP_basic_string_char_ctor_cstr @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD_K@Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBDABV?$allocator(a)D@1@@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD_KAEBV?$allocator(a)D@1@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 580ec5d..359ef39 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -679,6 +679,19 @@ basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor( return this; } +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBD@Z */ +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_cstr, 8) +basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr( + basic_string_char *this, const char *str) +{ + TRACE("%p %s\n", this, debugstr_a(str)); + + basic_string_char_tidy(this, FALSE, 0); + MSVCP_basic_string_char_assign_cstr(this, str); + return this; +} + /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4)

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 4bdeb7dcb3d32726f044fb23316334babc2db079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdeb7dcb3d32726f044fb233… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Aug 19 22:35:15 2010 +0100 crypt32: Constify some variables. --- dlls/crypt32/object.c | 6 +++--- dlls/crypt32/str.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index b3f8293..378ce51 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1170,7 +1170,7 @@ static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 }; static const WCHAR colonCrlf[] = { ':','\r','\n',0 }; static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, - CERT_ALT_NAME_ENTRY *entry, LPWSTR str, DWORD *pcbStr) + const CERT_ALT_NAME_ENTRY *entry, LPWSTR str, DWORD *pcbStr) { BOOL ret; WCHAR buf[MAX_STRING_RESOURCE_LEN]; @@ -1354,7 +1354,7 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, } static BOOL CRYPT_FormatAltNameInfo(DWORD dwFormatStrType, DWORD indentLevel, - CERT_ALT_NAME_INFO *name, LPWSTR str, DWORD *pcbStr) + const CERT_ALT_NAME_INFO *name, LPWSTR str, DWORD *pcbStr) { DWORD i, size, bytesNeeded = 0; BOOL ret = TRUE; @@ -1437,7 +1437,7 @@ static BOOL WINAPI CRYPT_FormatAltName(DWORD dwCertEncodingType, } static BOOL CRYPT_FormatCertIssuer(DWORD dwFormatStrType, - CERT_ALT_NAME_INFO *issuer, LPWSTR str, DWORD *pcbStr) + const CERT_ALT_NAME_INFO *issuer, LPWSTR str, DWORD *pcbStr) { WCHAR buf[MAX_STRING_RESOURCE_LEN]; DWORD bytesNeeded, sepLen; diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 758abc9..914ccaa 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -970,7 +970,7 @@ static PCERT_ALT_NAME_ENTRY cert_find_alt_name_entry(PCCERT_CONTEXT cert, } static DWORD cert_get_name_from_rdn_attr(DWORD encodingType, - PCERT_NAME_BLOB name, LPCSTR oid, LPWSTR pszNameString, DWORD cchNameString) + const CERT_NAME_BLOB *name, LPCSTR oid, LPWSTR pszNameString, DWORD cchNameString) { CERT_NAME_INFO *nameInfo; DWORD bytes = 0, ret = 0;

1 0