November 2012 - Wine-Commits

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 15bef00d65f3c640a607f7520b9a93fed3c523af URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bef00d65f3c640a607f7520… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:54:27 2012 +0100 msvcp: Sync implementations. --- dlls/msvcp100/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp60/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp71/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp71/string.c | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/string.c | 4 ++-- 10 files changed, 80 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 65749d1..198cc33 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -7778,6 +7779,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)_W@std@@"); diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d6cb46c..85e6107 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2865,6 +2865,6 @@ @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) +@ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index a2a50df..1ad21ae 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -7652,6 +7653,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)_W@std@@"); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 9a64013..8dcf374 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4312,9 +4312,9 @@ @ stub mbrlen # msvcrt.mbrlen @ stub mbrtowc # msvcrt.mbrtowc @ stub mbsrtowcs # msvcrt.mbsrtowcs -@ stub towctrans +@ cdecl towctrans(long long) @ stub wcrtomb # msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob -@ stub wctrans +@ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 3d836b2..aa6aa17 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5101,9 +5101,9 @@ @ stub mbrlen @ stub mbrtowc @ stub mbsrtowcs -@ stub towctrans +@ cdecl towctrans(long long) msvcp90.towctrans @ stub wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob -@ stub wctrans +@ cdecl wctrans(str) msvcp90.wctrans @ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index de5f7fa..381c21e 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -8275,6 +8276,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)_W@std@@"); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index c351c44..7ac0eb3 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5161,9 +5161,9 @@ @ stub mbrlen @ stub mbrtowc @ stub mbsrtowcs -@ stub towctrans +@ cdecl towctrans(long long) @ stub wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob -@ stub wctrans +@ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index fd3bffa..415e514 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -565,7 +565,7 @@ MSVCP_bool __thiscall basic_string_char_inside( { char *cstr = basic_string_char_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEX_NI(a)Z */ @@ -2256,7 +2256,7 @@ MSVCP_bool __thiscall basic_string_wchar_inside( { wchar_t *cstr = basic_string_wchar_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEX_NI(a)Z */ diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 7946f0c..902b636 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5785,6 +5785,6 @@ @ stub __Stofx @ stub __Stoldx @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) msvcp90.towctrans +@ cdecl wctrans(str) msvcp90.wctrans @ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 838d1b0..a0359a1 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -563,7 +563,7 @@ MSVCP_bool __thiscall basic_string_char_inside( { char *cstr = basic_string_char_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEX_NI(a)Z */ @@ -2377,7 +2377,7 @@ MSVCP_bool __thiscall basic_string_wchar_inside( { wchar_t *cstr = basic_string_wchar_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEX_NI(a)Z */

1 0

Dmitry Timoshkov : fonts: Update 10-pixel and some rarely used 9-pixel cyrillic bitmaps for Tahoma Bold .
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 1a6e9d4a50ec4a1a5464ca9c3bb02921d50eb777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6e9d4a50ec4a1a5464ca9c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 16 16:55:02 2012 +0800 fonts: Update 10-pixel and some rarely used 9-pixel cyrillic bitmaps for Tahoma Bold. --- fonts/tahomabd.sfd | 442 ++++++++++++++++++++++++++------------------------- fonts/tahomabd.ttf | Bin 92720 -> 92804 bytes 2 files changed, 225 insertions(+), 217 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a6e9d4a50ec4a1a5464c…

1 0

Detlef Riekenberg : ktmw32: Add a stub for CreateTransaction.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: e3df9043e9e8921110ea4e0aeb30a68b6c0b053b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3df9043e9e8921110ea4e0ae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 16 01:07:56 2012 +0100 ktmw32: Add a stub for CreateTransaction. --- dlls/ktmw32/ktmw32.spec | 2 +- dlls/ktmw32/ktmw32_main.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec index 062f1f2..cda7bbd 100644 --- a/dlls/ktmw32/ktmw32.spec +++ b/dlls/ktmw32/ktmw32.spec @@ -4,7 +4,7 @@ @ stub CommitTransactionAsync @ stub CreateEnlistment @ stub CreateResourceManager -@ stub CreateTransaction +@ stdcall CreateTransaction(ptr ptr long long long long wstr) @ stub CreateTransactionManager @ stub GetCurrentClockTransactionManager @ stub GetEnlistmentId diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 738b11d..0650b09 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -23,6 +23,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ktmw32); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -39,3 +42,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * CreateTransaction (ktmw32.@) + */ +HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD options, + DWORD level, DWORD flags, DWORD timeout, LPWSTR description) +{ + + FIXME("(%p %p 0x%x 0x%x 0x%x, %u, %s): stub\n", + pattr, pguid, options, level, flags, timeout, debugstr_w(description)); + + return (HANDLE) 1; +}

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D3.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: ea4ae09c863264ad82d392cc3b55291a32d58cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4ae09c863264ad82d392cc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:51 2012 +0100 ddraw: Avoid LPDIRECT3D3. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index d321846..f1b9e2d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1155,7 +1155,7 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D3 *lplpDirect3D3) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D3 **d3d) PURE; /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport3 **viewport) PURE;

1 0

Henri Verbeet : wined3d: Make state_geometry_shader() static.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: ffd892f6ddf021253e3d01df71a9c9c75a34571b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd892f6ddf021253e3d01df7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:52 2012 +0100 wined3d: Make state_geometry_shader() static. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2376527..9b5d875 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3760,7 +3760,7 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta context->load_constants = 1; } -void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { context->select_shader = 1; }

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D7.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 0fa127b1fabee80a179508a21e83a95420697c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa127b1fabee80a179508a21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:50 2012 +0100 ddraw: Avoid LPDIRECT3D7. --- dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 73317a8..6f4416c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -30,7 +30,7 @@ #include "unknwn.h" static IDirectDraw7 *lpDD; -static LPDIRECT3D7 lpD3D = NULL; +static IDirect3D7 *lpD3D; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth; static IDirect3DDevice7 *lpD3DDevice; diff --git a/include/d3d.h b/include/d3d.h index 4f1ffba..d321846 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1299,7 +1299,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D7 *lplpDirect3D3) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D7 **d3d) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE;

1 0

Henri Verbeet : d3d9/tests: Also test that render states get reset in test_reset().
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: b52118d53dca8da5d64ee211425ca9317692a627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52118d53dca8da5d64ee2114… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:54 2012 +0100 d3d9/tests: Also test that render states get reset in test_reset(). --- dlls/d3d9/tests/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 614538a..fd3fd30 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -876,6 +876,7 @@ static void test_reset(void) IDirect3DDevice9 *device1 = NULL; IDirect3DDevice9 *device2 = NULL; D3DCAPS9 caps; + DWORD value; struct { UINT w; @@ -976,6 +977,12 @@ static void test_reset(void) hr = IDirect3DDevice9_SetViewport(device1, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %08x\n", hr); + hr = IDirect3DDevice9_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + hr = IDirect3DDevice9_SetRenderState(device1, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; @@ -987,6 +994,10 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + hr = IDirect3DDevice9_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + ZeroMemory(&vp, sizeof(vp)); hr = IDirect3DDevice9_GetViewport(device1, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr);

1 0

Piotr Caban : msvcp90: Added wctrans and towctrans tests.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: a497d36a62637cb022ed02e36e1bc4a09c2947da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a497d36a62637cb022ed02e36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:47 2012 +0100 msvcp90: Added wctrans and towctrans tests. --- dlls/msvcp90/tests/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 5188fd5..2cb7380 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <locale.h> +#include <wctype.h> #include <windef.h> #include <winbase.h> @@ -66,6 +67,8 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); +static wctrans_t (__cdecl *p_wctrans)(const char*); +static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); #undef __thiscall #ifdef __i386__ @@ -188,6 +191,8 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p__Getctype, "_Getctype"); SET(p__Getcoll, "_Getcoll"); + SET(p_wctrans, "wctrans"); + SET(p_towctrans, "towctrans"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); @@ -440,6 +445,37 @@ static void test__Getcoll(void) ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); } +static void test_towctrans(void) +{ + wchar_t ret; + + ret = p_wctrans("tolower"); + ok(ret == 2, "wctrans returned %d, expected 2\n", ret); + ret = p_wctrans("toupper"); + ok(ret == 1, "wctrans returned %d, expected 1\n", ret); + ret = p_wctrans("toLower"); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + ret = p_wctrans(""); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + if(0) { /* crashes on windows */ + ret = p_wctrans(NULL); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + } + + ret = p_towctrans('t', 2); + ok(ret == 't', "towctrans('t', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 2); + ok(ret == 't', "towctrans('T', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 0); + ok(ret == 't', "towctrans('T', 0) returned %c, expected t\n", ret); + ret = p_towctrans('T', 3); + ok(ret == 't', "towctrans('T', 3) returned %c, expected t\n", ret); + ret = p_towctrans('t', 1); + ok(ret == 'T', "towctrans('t', 1) returned %c, expected T\n", ret); + ret = p_towctrans('T', 1); + ok(ret == 'T', "towctrans('T', 1) returned %c, expected T\n", ret); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -525,6 +561,7 @@ START_TEST(misc) test_wctype(); test__Getctype(); test__Getcoll(); + test_towctrans(); test_virtual_call(); test_virtual_base_dtors();

1 0

Michael Stefaniuc : krnl386.exe16: Use FIELD_OFFSET for the size of structs with varlength arrays.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: a5c621d40e83c8dad7261ee484adbad7a06a3ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c621d40e83c8dad7261ee48… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 16 11:15:06 2012 +0100 krnl386.exe16: Use FIELD_OFFSET for the size of structs with varlength arrays. --- dlls/krnl386.exe16/atom.c | 2 +- dlls/krnl386.exe16/task.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/atom.c b/dlls/krnl386.exe16/atom.c index 0c52f1f..a059561 100644 --- a/dlls/krnl386.exe16/atom.c +++ b/dlls/krnl386.exe16/atom.c @@ -163,7 +163,7 @@ WORD WINAPI InitAtomTable16( WORD entries ) /* Allocate the table */ if (!entries) entries = DEFAULT_ATOMTABLE_SIZE; /* sanity check */ - handle = LocalAlloc16( LMEM_FIXED, sizeof(ATOMTABLE) + (entries-1) * sizeof(HANDLE16) ); + handle = LocalAlloc16( LMEM_FIXED, FIELD_OFFSET( ATOMTABLE, entries[entries] )); if (!handle) return 0; table = MapSL( MAKESEGPTR( CURRENT_DS, handle ) ); table->size = entries; diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index b067c81..f3fc56d 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -200,7 +200,7 @@ static SEGPTR TASK_AllocThunk(void) sel = pThunk->next; if (!sel) /* Allocate a new segment */ { - sel = GLOBAL_Alloc( GMEM_FIXED, sizeof(THUNKS) + (MIN_THUNKS-1)*8, + sel = GLOBAL_Alloc( GMEM_FIXED, FIELD_OFFSET( THUNKS, thunks[MIN_THUNKS] ), pTask->hPDB, WINE_LDT_FLAGS_CODE ); if (!sel) return 0; TASK_CreateThunks( sel, 0, MIN_THUNKS );

1 0

Michael Stefaniuc : ws2_32: Avoid using sizeof on structs with variable length array.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 0b02d25f6d915a5a4bc1bc6571f97020399c14ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b02d25f6d915a5a4bc1bc657… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 16 11:11:57 2012 +0100 ws2_32: Avoid using sizeof on structs with variable length array. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5c69d21..ceda75b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1912,7 +1912,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) TRACE("s %ld type %d\n", s, type); - wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); + wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )); if ( !wsa ) return WSAEFAULT; @@ -2450,7 +2450,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n FD_WINE_CONNECTED|FD_WINE_LISTENING); /* Indirectly call WSASend */ - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ))) + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )))) { SetLastError(WSAEFAULT); }

1 0