November 2010 - Wine-commits

Piotr Caban : msvcp90/tests: Added basic_string<char>::append tests.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: d3b89e2d971146585e68620f87d11641aca245a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b89e2d971146585e68620f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 18 12:20:36 2010 +0100 msvcp90/tests: Added basic_string<char>::append tests. --- dlls/msvcp90/tests/string.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 5d31289..15e46a4 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -61,6 +61,8 @@ static const char* (WINAPI *p_basic_string_char_cstr)(void); static const char* (WINAPI *p_basic_string_char_data)(void); static size_t (WINAPI *p_basic_string_char_size)(void); static void (WINAPI *p_basic_string_char_swap)(basic_string_char*); +static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char*); +static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, size_t, size_t); static basic_string_wchar* (WINAPI *p_basic_string_wchar_ctor)(void); static basic_string_wchar* (WINAPI *p_basic_string_wchar_copy_ctor)(basic_string_wchar*); @@ -83,6 +85,8 @@ static const char* (__cdecl *p_basic_string_char_cstr)(basic_string_char*); static const char* (__cdecl *p_basic_string_char_data)(basic_string_char*); static size_t (__cdecl *p_basic_string_char_size)(basic_string_char*); static void (__cdecl *p_basic_string_char_swap)(basic_string_char*, basic_string_char*); +static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char*, basic_string_char*); +static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, basic_string_char*, size_t, size_t); static basic_string_wchar* (__cdecl *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__cdecl *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); @@ -157,6 +161,24 @@ static inline void* do_call_func3(void *func, void *_this, } return (void*)retval; } + +static inline void* do_call_func4(void *func, void *_this, + const void *arg1, const void *arg2, const void *arg3) +{ + volatile void* retval = 0; + __asm + { + push ecx + push arg1 + push arg2 + push arg3 + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} #else static void* do_call_func1(void *func, void *_this) { @@ -194,17 +216,32 @@ static void* do_call_func3(void *func, void *_this, ); return ret; } + +static void* do_call_func4(void *func, void *_this, + const void *arg1, const void *arg2, const void *arg3) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "pushl %5\n\tpushl %4\n\tpushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg1), "r" (arg2), "m" (arg3), "1" (_this) + : "edx", "memory" + ); + return ret; +} #endif #define call_func1(func,_this) do_call_func1(func,_this) #define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)a) #define call_func3(func,_this,a,b) do_call_func3(func,_this,(const void*)a,(const void*)b) +#define call_func4(func,_this,a,b,c) do_call_func4(func,_this,(const void*)a,(const void*)b,(const void*)c) #else #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) #define call_func3(func,_this,a,b) func(_this,a,b) +#define call_func4(func,_this,a,b,c) func(_this,a,b,c) #endif /* __i386__ */ @@ -246,6 +283,10 @@ static BOOL init(void) "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ"); p_basic_string_char_swap = (void*)GetProcAddress(msvcp, "?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z"); + p_basic_string_char_append = (void*)GetProcAddress(msvcp, + "?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z"); + p_basic_string_char_append_substr = (void*)GetProcAddress(msvcp, + "?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z "); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ"); @@ -288,6 +329,10 @@ static BOOL init(void) "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ"); p_basic_string_char_swap = (void*)GetProcAddress(msvcp, "?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z"); + p_basic_string_char_append = (void*)GetProcAddress(msvcp, + "?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@@Z"); + p_basic_string_char_append_substr = (void*)GetProcAddress(msvcp, + "?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ"); @@ -420,6 +465,40 @@ static void test_basic_string_char_swap(void) { call_func1(p_basic_string_char_dtor, &str2); } +static void test_basic_string_char_append(void) { + basic_string_char str1, str2; + const char *str; + + if(!p_basic_string_char_ctor_cstr || !p_basic_string_char_dtor + || !p_basic_string_char_append || !p_basic_string_char_append_substr + || !p_basic_string_char_cstr) { + win_skip("basic_string<char> unavailable\n"); + return; + } + + call_func2(p_basic_string_char_ctor_cstr, &str1, ""); + call_func2(p_basic_string_char_ctor_cstr, &str2, "append"); + + call_func2(p_basic_string_char_append, &str1, &str2); + str = call_func1(p_basic_string_char_cstr, &str1); + ok(!memcmp(str, "append", 7), "str = %s\n", str); + + call_func4(p_basic_string_char_append_substr, &str1, &str2, 3, 1); + str = call_func1(p_basic_string_char_cstr, &str1); + ok(!memcmp(str, "appende", 8), "str = %s\n", str); + + call_func4(p_basic_string_char_append_substr, &str1, &str2, 5, 100); + str = call_func1(p_basic_string_char_cstr, &str1); + ok(!memcmp(str, "appended", 9), "str = %s\n", str); + + call_func4(p_basic_string_char_append_substr, &str1, &str2, 6, 100); + str = call_func1(p_basic_string_char_cstr, &str1); + ok(!memcmp(str, "appended", 9), "str = %s\n", str); + + call_func1(p_basic_string_char_dtor, &str1); + call_func1(p_basic_string_char_dtor, &str2); +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -536,6 +615,7 @@ START_TEST(string) test_basic_string_char(); test_basic_string_char_swap(); + test_basic_string_char_append(); test_basic_string_wchar(); test_basic_string_wchar_swap();

1 0

Piotr Caban : msvcp80: Update spec file.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 2fb7edc325ad5e580a3557aadd42ed00a1bb0dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb7edc325ad5e580a3557aad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 18 12:20:45 2010 +0100 msvcp80: Update spec file. --- dlls/msvcp80/msvcp80.spec | 48 ++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fb7edc325ad5e580a355…

1 0

Henri Verbeet : wined3d: Disallow empty surfaces.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 4f651808fcae9c378af58585a28d265578b27899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f651808fcae9c378af58585a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 12:21:39 2010 +0100 wined3d: Disallow empty surfaces. --- dlls/d3d9/tests/visual.c | 7 ++----- dlls/wined3d/surface.c | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9e5b9a0..f2eb4b4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10613,11 +10613,8 @@ static void depth_bounds_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, MAKEFOURCC('N','V','D','B'), D3DPOOL_DEFAULT, &offscreen_surface, NULL); - todo_wine ok(hr != D3D_OK, "Able to create surface, hr = %08x\n", hr); - if(offscreen_surface) - { - IDirect3DSurface9_Release(offscreen_surface); - } + ok(FAILED(hr), "Able to create surface, hr %#x.\n", hr); + if (offscreen_surface) IDirect3DSurface9_Release(offscreen_surface); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 432eb9b..e60a684 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -353,6 +353,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, /* FIXME: Check that the format is supported by the device. */ resource_size = wined3d_format_calculate_size(format, alignment, width, height); + if (!resource_size) return WINED3DERR_INVALIDCALL; /* Look at the implementation and set the correct Vtable. */ switch (surface_type)

1 0

Henri Verbeet : d3d9/tests: Add a test for 0 width / height surface creation.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 4ea2d9f62f03d645876bc9d9a9ee5ed487d7857f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea2d9f62f03d645876bc9d9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 12:21:40 2010 +0100 d3d9/tests: Add a test for 0 width / height surface creation. --- dlls/d3d9/tests/surface.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index c1246fc..7fcf6e4 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -491,6 +491,20 @@ static void test_getdc(IDirect3DDevice9 *device) } } +static void test_surface_dimensions(IDirect3DDevice9 *device) +{ + IDirect3DSurface9 *surface; + HRESULT hr; + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 0, 1, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); + ok(hr == D3DERR_INVALIDCALL, "CreateOffscreenPlainSurface returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); + ok(hr == D3DERR_INVALIDCALL, "CreateOffscreenPlainSurface returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface); +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -513,6 +527,7 @@ START_TEST(surface) test_lockrect_invalid(device_ptr); test_private_data(device_ptr); test_getdc(device_ptr); + test_surface_dimensions(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Henri Verbeet : d3d8/tests: Add a test for 0 width / height surface creation.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: f683fe313b9b45f316e3095de366a66c77e978b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f683fe313b9b45f316e3095de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 12:21:41 2010 +0100 d3d8/tests: Add a test for 0 width / height surface creation. --- dlls/d3d8/tests/surface.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 4980a41..f75c15b 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -320,6 +320,20 @@ static void test_private_data(IDirect3DDevice8 *device) ok(ref2 == (ref - 1), "Object reference is %d, expected %d\n", ref2, ref - 1); } +static void test_surface_dimensions(IDirect3DDevice8 *device) +{ + IDirect3DSurface8 *surface; + HRESULT hr; + + hr = IDirect3DDevice8_CreateImageSurface(device, 0, 1, D3DFMT_A8R8G8B8, &surface); + ok(hr == D3DERR_INVALIDCALL, "CreateOffscreenPlainSurface returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + if (SUCCEEDED(hr)) IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_CreateImageSurface(device, 1, 0, D3DFMT_A8R8G8B8, &surface); + ok(hr == D3DERR_INVALIDCALL, "CreateOffscreenPlainSurface returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + if (SUCCEEDED(hr)) IDirect3DSurface8_Release(surface); +} + START_TEST(surface) { HMODULE d3d8_handle; @@ -340,6 +354,7 @@ START_TEST(surface) test_surface_get_container(device_ptr); test_lockrect_invalid(device_ptr); test_private_data(device_ptr); + test_surface_dimensions(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Henri Verbeet : ddraw: Return DDERR_INVALIDPARAMS for 0 width / height surface creation.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 63316d096702393691236b29bc3bf7f8e414a49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63316d096702393691236b29b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 12:21:42 2010 +0100 ddraw: Return DDERR_INVALIDPARAMS for 0 width / height surface creation. --- dlls/ddraw/ddraw.c | 6 ++++++ dlls/ddraw/tests/dsurface.c | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b9ff201..c0354ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3069,6 +3069,12 @@ static HRESULT CreateSurface(IDirectDraw7 *iface, desc2.dwHeight = Mode.Height; } + if (!desc2.dwWidth || !desc2.dwHeight) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + } + /* Mipmap count fixes */ if(desc2.ddsCaps.dwCaps & DDSCAPS_MIPMAP) { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ee221ce..8bc849d 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2391,6 +2391,30 @@ static void SizeTest(void) dsurface = NULL; } + /* Test 0 height. */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + desc.dwWidth = 1; + desc.dwHeight = 0; + ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Creating a 0 height surface returned %#x, expected DDERR_INVALIDPARAMS.\n", ret); + if (SUCCEEDED(ret)) IDirectDrawSurface_Release(dsurface); + dsurface = NULL; + + /* Test 0 width. */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + desc.dwWidth = 0; + desc.dwHeight = 1; + ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Creating a 0 width surface returned %#x, expected DDERR_INVALIDPARAMS.\n", ret); + if (SUCCEEDED(ret)) IDirectDrawSurface_Release(dsurface); + dsurface = NULL; + /* Sanity check */ ZeroMemory(&desc, sizeof(desc)); desc.dwSize = sizeof(desc);

1 0

Vincas Miliūnas : msvcrt: Added qsort_s implementation .
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 955e2f90505a6e6e591e447e1dcc4dacab56f6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=955e2f90505a6e6e591e447e1… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Wed Nov 17 18:07:47 2010 +0200 msvcrt: Added qsort_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 67 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 28243de..6e860e8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1550,7 +1550,7 @@ @ cdecl putwc(long ptr) msvcrt.putwc @ cdecl putwchar(long) msvcrt.putwchar @ cdecl qsort(ptr long long ptr) msvcrt.qsort -@ stub qsort_s +@ cdecl qsort_s(ptr long long ptr ptr) msvcrt.qsort_s @ cdecl raise(long) msvcrt.raise @ cdecl rand() msvcrt.rand @ cdecl rand_s(ptr) msvcrt.rand_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9206b93..17785be 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1404,7 +1404,7 @@ @ cdecl putwc(long ptr) msvcrt.putwc @ cdecl putwchar(long) msvcrt.putwchar @ cdecl qsort(ptr long long ptr) msvcrt.qsort -@ stub qsort_s +@ cdecl qsort_s(ptr long long ptr ptr) msvcrt.qsort_s @ cdecl raise(long) msvcrt.raise @ cdecl rand() msvcrt.rand @ cdecl rand_s(ptr) msvcrt.rand_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ea00630..663e1b7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1388,7 +1388,7 @@ @ cdecl putwc(long ptr) msvcrt.putwc @ cdecl putwchar(long) msvcrt.putwchar @ cdecl qsort(ptr long long ptr) msvcrt.qsort -@ stub qsort_s +@ cdecl qsort_s(ptr long long ptr ptr) msvcrt.qsort_s @ cdecl raise(long) msvcrt.raise @ cdecl rand() msvcrt.rand @ cdecl rand_s(ptr) msvcrt.rand_s diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c044d63..d37fc72 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -186,3 +186,70 @@ void CDECL _chkesp(void) # endif /* __GNUC__ */ #endif /* __i386__ */ + +/********************************************************************* + * Helper function for MSVCRT_qsort_s. + * + * Based on NTDLL_qsort in dlls/ntdll/misc.c + */ +static void MSVCRT_mergesort( void *arr, void *barr, size_t elemsize, + int (CDECL *compar)(void *, const void *, const void *), + size_t left, size_t right, void *context ) +{ + if (right>left) { + size_t i, j, k, m; + m=left+(right-left)/2; + MSVCRT_mergesort(arr, barr, elemsize, compar, left, m, context); + MSVCRT_mergesort(arr, barr, elemsize, compar, m+1, right, context); + +#define X(a,i) ((char*)a+elemsize*(i)) + for (i=m+1; i>left; i--) + memcpy (X(barr,(i-1)),X(arr,(i-1)),elemsize); + for (j=m; j<right; j++) + memcpy (X(barr,(right+m-j)),X(arr,(j+1)),elemsize); + + /* i=left; j=right; */ + for (k=left; i<=m && j>m; k++) { + if (i==j || compar(context, X(barr,i),X(barr,j))<=0) { + memcpy(X(arr,k),X(barr,i),elemsize); + i++; + } else { + memcpy(X(arr,k),X(barr,j),elemsize); + j--; + } + } + for (; i<=m; i++, k++) + memcpy(X(arr,k),X(barr,i),elemsize); + for (; j>m; j--, k++) + memcpy(X(arr,k),X(barr,j),elemsize); + } +#undef X +} + +/********************************************************************* + * qsort_s (MSVCRT.@) + * + * Based on NTDLL_qsort in dlls/ntdll/misc.c + */ +void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(void *, const void *, const void *), void *context) +{ + void *secondarr; + const size_t total_size = nmemb*size; + + if (!MSVCRT_CHECK_PMT(base != NULL || (base == NULL && nmemb == 0)) || + !MSVCRT_CHECK_PMT(size > 0) || !MSVCRT_CHECK_PMT(compar != NULL) || + total_size / size != nmemb) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return; + } + + if (nmemb < 2) return; + + secondarr = MSVCRT_malloc(total_size); + if (!secondarr) + return; + MSVCRT_mergesort(base, secondarr, size, compar, 0, nmemb-1, context); + MSVCRT_free(secondarr); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 63e3b71..3db6fa4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1344,7 +1344,7 @@ @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) _fputwchar @ cdecl qsort(ptr long long ptr) ntdll.qsort -# stub qsort_s +@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s @ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s

1 0

Vincas Miliūnas : msvcr90/tests: Added qsort_s tests.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 5083f0d20c77aa1732e9c3c8d0c98def44577cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5083f0d20c77aa1732e9c3c8d… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Wed Nov 17 18:07:58 2010 +0200 msvcr90/tests: Added qsort_s tests. --- dlls/msvcr90/tests/msvcr90.c | 134 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 1a94182..874f98d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -65,10 +65,12 @@ 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 (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, const void *, const void *), void *); static void* (WINAPI *pEncodePointer)(void *); static int cb_called[4]; +static int g_qsort_s_context_counter; /* ########## */ @@ -442,6 +444,136 @@ static void test_wcsncat_s(void) CHECK_CALLED(invalid_parameter_handler); } +/* Based on dlls/ntdll/tests/string.c */ +static __cdecl int intcomparefunc(void *context, const void *a, const void*b) +{ + ok (a != b, "must never get the same pointer\n"); + ++*(int *) context; + return (*(int*)a) - (*(int*)b); +} + +static __cdecl int charcomparefunc(void *context, const void *a, const void*b) +{ + ok (a != b, "must never get the same pointer\n"); + ++*(int *) context; + return (*(char*)a) - (*(char*)b); +} + +static __cdecl int strcomparefunc(void *context, const void *a, const void*b) +{ + ok (a != b, "must never get the same pointer\n"); + ++*(int *) context; + return lstrcmpA(*(char**)a,*(char**)b); +} + +static void test_qsort_s(void) +{ + int arr[5] = { 23, 42, 8, 4, 16 }; + int arr2[5] = { 23, 42, 8, 4, 16 }; + char carr[5] = { 42, 23, 4, 8, 16 }; + const char *strarr[7] = { + "Hello", + "Wine", + "World", + "!", + "Hopefully", + "Sorted", + "." + }; + + if(!p_qsort_s) { + win_skip("qsort_s not found\n"); + return; + } + + SET_EXPECT(invalid_parameter_handler); + p_qsort_s(NULL, 0, 0, NULL, NULL); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + p_qsort_s(NULL, 0, 0, intcomparefunc, NULL); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + p_qsort_s(NULL, 0, sizeof(int), NULL, NULL); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + p_qsort_s(NULL, 1, sizeof(int), intcomparefunc, NULL); + CHECK_CALLED(invalid_parameter_handler); + + g_qsort_s_context_counter = 0; + p_qsort_s(NULL, 0, sizeof(int), intcomparefunc, NULL); + ok(g_qsort_s_context_counter == 0, "callback shouldn't have been called\n"); + + /* overflow without side effects, other overflow values crash */ + g_qsort_s_context_counter = 0; + p_qsort_s((void*)arr2, (1 << (8*sizeof(size_t) - 1)) + 1, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); + ok(g_qsort_s_context_counter == 0, "callback shouldn't have been called\n"); + ok(arr2[0] == 23, "should remain unsorted, arr2[0] is %d\n", arr2[0]); + ok(arr2[1] == 42, "should remain unsorted, arr2[1] is %d\n", arr2[1]); + ok(arr2[2] == 8, "should remain unsorted, arr2[2] is %d\n", arr2[2]); + ok(arr2[3] == 4, "should remain unsorted, arr2[3] is %d\n", arr2[3]); + + g_qsort_s_context_counter = 0; + p_qsort_s((void*)arr, 0, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); + ok(g_qsort_s_context_counter == 0, "callback shouldn't have been called\n"); + ok(arr[0] == 23, "badly sorted, nmemb=0, arr[0] is %d\n", arr[0]); + ok(arr[1] == 42, "badly sorted, nmemb=0, arr[1] is %d\n", arr[1]); + ok(arr[2] == 8, "badly sorted, nmemb=0, arr[2] is %d\n", arr[2]); + ok(arr[3] == 4, "badly sorted, nmemb=0, arr[3] is %d\n", arr[3]); + ok(arr[4] == 16, "badly sorted, nmemb=0, arr[4] is %d\n", arr[4]); + + g_qsort_s_context_counter = 0; + p_qsort_s((void*)arr, 1, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); + ok(g_qsort_s_context_counter == 0, "callback shouldn't have been called\n"); + ok(arr[0] == 23, "badly sorted, nmemb=1, arr[0] is %d\n", arr[0]); + ok(arr[1] == 42, "badly sorted, nmemb=1, arr[1] is %d\n", arr[1]); + ok(arr[2] == 8, "badly sorted, nmemb=1, arr[2] is %d\n", arr[2]); + ok(arr[3] == 4, "badly sorted, nmemb=1, arr[3] is %d\n", arr[3]); + ok(arr[4] == 16, "badly sorted, nmemb=1, arr[4] is %d\n", arr[4]); + + SET_EXPECT(invalid_parameter_handler); + g_qsort_s_context_counter = 0; + p_qsort_s((void*)arr, 5, 0, intcomparefunc, &g_qsort_s_context_counter); + ok(g_qsort_s_context_counter == 0, "callback shouldn't have been called\n"); + ok(arr[0] == 23, "badly sorted, size=0, arr[0] is %d\n", arr[0]); + ok(arr[1] == 42, "badly sorted, size=0, arr[1] is %d\n", arr[1]); + ok(arr[2] == 8, "badly sorted, size=0, arr[2] is %d\n", arr[2]); + ok(arr[3] == 4, "badly sorted, size=0, arr[3] is %d\n", arr[3]); + ok(arr[4] == 16, "badly sorted, size=0, arr[4] is %d\n", arr[4]); + CHECK_CALLED(invalid_parameter_handler); + + g_qsort_s_context_counter = 0; + p_qsort_s((void*)arr, 5, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); + ok(g_qsort_s_context_counter > 0, "callback wasn't called\n"); + ok(arr[0] == 4, "badly sorted, arr[0] is %d\n", arr[0]); + ok(arr[1] == 8, "badly sorted, arr[1] is %d\n", arr[1]); + ok(arr[2] == 16, "badly sorted, arr[2] is %d\n", arr[2]); + ok(arr[3] == 23, "badly sorted, arr[3] is %d\n", arr[3]); + ok(arr[4] == 42, "badly sorted, arr[4] is %d\n", arr[4]); + + g_qsort_s_context_counter = 0; + p_qsort_s((void*)carr, 5, sizeof(char), charcomparefunc, &g_qsort_s_context_counter); + ok(g_qsort_s_context_counter > 0, "callback wasn't called\n"); + ok(carr[0] == 4, "badly sorted, carr[0] is %d\n", carr[0]); + ok(carr[1] == 8, "badly sorted, carr[1] is %d\n", carr[1]); + ok(carr[2] == 16, "badly sorted, carr[2] is %d\n", carr[2]); + ok(carr[3] == 23, "badly sorted, carr[3] is %d\n", carr[3]); + ok(carr[4] == 42, "badly sorted, carr[4] is %d\n", carr[4]); + + g_qsort_s_context_counter = 0; + p_qsort_s((void*)strarr, 7, sizeof(char*), strcomparefunc, &g_qsort_s_context_counter); + ok(g_qsort_s_context_counter > 0, "callback wasn't called\n"); + ok(!strcmp(strarr[0],"!"), "badly sorted, strarr[0] is %s\n", strarr[0]); + ok(!strcmp(strarr[1],"."), "badly sorted, strarr[1] is %s\n", strarr[1]); + ok(!strcmp(strarr[2],"Hello"), "badly sorted, strarr[2] is %s\n", strarr[2]); + ok(!strcmp(strarr[3],"Hopefully"), "badly sorted, strarr[3] is %s\n", strarr[3]); + ok(!strcmp(strarr[4],"Sorted"), "badly sorted, strarr[4] is %s\n", strarr[4]); + ok(!strcmp(strarr[5],"Wine"), "badly sorted, strarr[5] is %s\n", strarr[5]); + ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); +} + /* ########## */ START_TEST(msvcr90) @@ -473,6 +605,7 @@ START_TEST(msvcr90) p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); p_itoa_s = (void *)GetProcAddress(hcrt, "_itoa_s"); p_wcsncat_s = (void *)GetProcAddress( hcrt,"wcsncat_s" ); + p_qsort_s = (void *) GetProcAddress(hcrt, "qsort_s"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -483,4 +616,5 @@ START_TEST(msvcr90) test__strtoi64(); test__itoa_s(); test_wcsncat_s(); + test_qsort_s(); }

1 0

Damjan Jovanovic : winemenubuilder: Update TODO.
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 7b7893d3aa83967096b8f076858f17d8b3ce04e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7893d3aa83967096b8f0768… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Nov 18 11:41:24 2010 +0200 winemenubuilder: Update TODO. --- programs/winemenubuilder/winemenubuilder.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 55a2e2b..71aca92 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -52,9 +52,6 @@ * group. * Clean up fd.o menu icons and .directory files when the menu is deleted * in Windows. - * Generate icons for file open handlers to go into the "Open with..." - * list. What does Windows use, the default icon for the .EXE file? It's - * not in the registry. * Associate applications under HKCR\Applications to open any MIME type * (by associating with application/octet-stream, or how?). * Clean up fd.o MIME types when they are deleted in Windows, their icons

1 0

Damjan Jovanovic : winemenubuilder: Deduplicate some file open associations .
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: eaf4307cd70bd532cf8bee146a3b79c30ebd5352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf4307cd70bd532cf8bee146… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Nov 18 11:52:10 2010 +0200 winemenubuilder: Deduplicate some file open associations. --- programs/winemenubuilder/winemenubuilder.c | 76 ++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 71aca92..324aab8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -94,6 +94,7 @@ #include "wine/debug.h" #include "wine/library.h" #include "wine/list.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); @@ -161,6 +162,12 @@ struct xdg_mime_type struct list entry; }; +struct rb_string_entry +{ + char *string; + struct wine_rb_entry entry; +}; + DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); static char *xdg_config_dir; @@ -228,6 +235,43 @@ static char* heap_printf(const char *format, ...) return ret; } +static int winemenubuilder_rb_string_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, const struct rb_string_entry, entry); + + return strcmp((char*)key, t->string); +} + +static void *winemenubuilder_rb_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *winemenubuilder_rb_realloc(void *ptr, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + +static void winemenubuilder_rb_free(void *ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context) +{ + struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry); + HeapFree(GetProcessHeap(), 0, t->string); + HeapFree(GetProcessHeap(), 0, t); +} + +static const struct wine_rb_functions winemenubuilder_rb_functions = +{ + winemenubuilder_rb_alloc, + winemenubuilder_rb_realloc, + winemenubuilder_rb_free, + winemenubuilder_rb_string_compare, +}; + static void write_xml_text(FILE *file, const char *text) { int i; @@ -2108,11 +2152,17 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { static const WCHAR openW[] = {'o','p','e','n',0}; + struct wine_rb_tree mimeProgidTree; struct list *nativeMimeTypes = NULL; LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; + if (wine_rb_init(&mimeProgidTree, &winemenubuilder_rb_functions)) + { + WINE_ERR("wine_rb_init failed\n"); + return FALSE; + } if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n"); @@ -2154,6 +2204,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *friendlyAppNameA = NULL; WCHAR *progIdW = NULL; char *progIdA = NULL; + char *mimeProgId = NULL; extensionA = wchars_to_utf8_chars(extensionW); if (extensionA == NULL) @@ -2265,6 +2316,30 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package else goto end; /* no progID => not a file type association */ + /* Do not allow duplicate ProgIDs for a MIME type, it causes unnecessary duplication in Open dialogs */ + mimeProgId = heap_printf("%s=>%s", mimeTypeA, progIdA); + if (mimeProgId) + { + struct rb_string_entry *entry; + if (wine_rb_get(&mimeProgidTree, mimeProgId)) + { + HeapFree(GetProcessHeap(), 0, mimeProgId); + goto end; + } + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct rb_string_entry)); + if (!entry) + { + WINE_ERR("out of memory allocating rb_string_entry\n"); + goto end; + } + entry->string = mimeProgId; + if (wine_rb_put(&mimeProgidTree, mimeProgId, &entry->entry)) + { + WINE_ERR("error updating rb tree\n"); + goto end; + } + } + if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, openWithIconA)) { char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); @@ -2300,6 +2375,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package break; } + wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL); free_native_mime_types(nativeMimeTypes); return hasChanged; }

1 0