November 2012 - Wine-commits

Austin English : secur32: Get rid of deprecated types.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 62e77128c57d33d0d42a956e87b8ee251a31848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e77128c57d33d0d42a956e8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 15 19:53:36 2012 -0800 secur32: Get rid of deprecated types. --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 16ce0de..bb481b7 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -129,7 +129,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, } err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials)cred); + (gnutls_certificate_credentials_t)cred); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -409,7 +409,7 @@ BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credential void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) { - pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); + pgnutls_certificate_free_credentials((gnutls_certificate_credentials_t)c); } static void schan_gnutls_log(int level, const char *msg)

1 0

Jacek Caban : cmd: Added HeapFree wrapper.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 08c17ada571c359d018079eae560b731495bbfdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c17ada571c359d018079eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 10:37:39 2012 +0100 cmd: Added HeapFree wrapper. --- programs/cmd/batch.c | 6 +++--- programs/cmd/builtins.c | 38 +++++++++++++++++++------------------- programs/cmd/directory.c | 20 ++++++++++---------- programs/cmd/wcmd.h | 5 +++++ programs/cmd/wcmdmain.c | 36 ++++++++++++++++++------------------ 5 files changed, 55 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08c17ada571c359d01807…

1 0

Huw Davies : winspool: Pre-1. 6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 02d41b7b1a605dfbb42f2d13225dc05549bf61f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d41b7b1a605dfbb42f2d132… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 16 09:53:14 2012 +0000 winspool: Pre-1.6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards. --- dlls/winspool.drv/info.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index af336cb..172f892 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -833,11 +833,14 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) http_status = cupsGetPPD3_wrapper( 0, printer_name, &modtime, unix_name, strlen( unix_name ) + 1 ); + + if (http_status != HTTP_OK) unlink( unix_name ); HeapFree( GetProcessHeap(), 0, unix_name ); if (http_status == HTTP_OK) return TRUE; - TRACE( "failed to get ppd for printer %s from cups, calling fallback\n", debugstr_a(printer_name) ); + TRACE( "failed to get ppd for printer %s from cups (status %d), calling fallback\n", + debugstr_a(printer_name), http_status ); return get_fallback_ppd( printer_name, ppd ); }

1 0

Piotr Caban : msvcp80: Forward functions that are using String_iterators to msvcp90.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 965543acff6ec3c939385561589e95bd802eada5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965543acff6ec3c9393855615… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:09 2012 +0100 msvcp80: Forward functions that are using String_iterators to msvcp90. --- dlls/msvcp80/msvcp80.spec | 132 ++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=965543acff6ec3c939385…

1 0

Piotr Caban : msvcp90: Added wctrans and towctrans implementation.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a71acb30764077e376d7c489994f2245308fe9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71acb30764077e376d7c4899… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:37 2012 +0100 msvcp90: Added wctrans and towctrans implementation. --- dlls/msvcp90/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- include/msvcrt/wctype.h | 5 +++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 31beeee..c3f48d9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -8541,6 +8542,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/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 742f162..e512acb 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5807,8 +5807,8 @@ @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) +@ cdecl wctrans(str) @ cdecl wctype(str) #Functions not exported in native dll: diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index d6bed60..81c2e22 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -68,6 +68,11 @@ wchar_t __cdecl towlower(wchar_t); wchar_t __cdecl towupper(wchar_t); #endif /* _WCTYPE_DEFINED */ +typedef wchar_t wctrans_t; +wint_t __cdecl towctrans(wint_t,wctrans_t); +wctrans_t __cdecl wctrans(const char *); +wctype_t __cdecl wctype(const char *); + #ifdef __cplusplus } #endif

1 0

Piotr Caban : msvcp90: Added wctrans and towctrans tests.
by Alexandre Julliard 16 Nov '12

16 Nov '12

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

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 16 Nov '12

16 Nov '12

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

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

16 Nov '12

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

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

16 Nov '12

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

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

16 Nov '12

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