March 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Copy some missing string functions from msvcrt.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: e3f9f7b38861b9f524bdd5210ffba439f629557b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f9f7b38861b9f524bdd5210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:53:46 2013 +0100 ntdll: Copy some missing string functions from msvcrt. --- dlls/ntdll/ntdll.spec | 12 +++++----- dlls/ntdll/string.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d144986..83e9260 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1247,10 +1247,10 @@ @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=x86_64 -norelay __chkstk() -# @ stub __isascii -# @ stub __iscsym -# @ stub __iscsymf -# @ stub __toascii +@ cdecl -private __isascii(long) NTDLL___isascii +@ cdecl -private __iscsym(long) NTDLL___iscsym +@ cdecl -private __iscsymf(long) NTDLL___iscsymf +@ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) # @ stub _alldvrm @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @@ -1284,8 +1284,8 @@ @ cdecl -private _strlwr(str) @ cdecl -private _strnicmp(str str long) @ cdecl -private _strupr(str) -# @ stub -private _tolower -# @ stub -private _toupper +@ cdecl -private _tolower(long) NTDLL__tolower +@ cdecl -private _toupper(long) NTDLL__toupper @ cdecl -private _ui64toa(int64 ptr long) @ cdecl -private _ui64tow(int64 ptr long) @ cdecl -private _ultoa(long ptr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 699adb5..e7a1a61 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -415,6 +415,60 @@ int __cdecl NTDLL_isxdigit( int c ) /********************************************************************* + * __isascii (NTDLL.@) + */ +int CDECL NTDLL___isascii(int c) +{ + return (unsigned)c < 0x80; +} + + +/********************************************************************* + * __toascii (NTDLL.@) + */ +int CDECL NTDLL___toascii(int c) +{ + return (unsigned)c & 0x7f; +} + + +/********************************************************************* + * __iscsym (NTDLL.@) + */ +int CDECL NTDLL___iscsym(int c) +{ + return (c < 127 && (isalnum(c) || c == '_')); +} + + +/********************************************************************* + * __iscsymf (NTDLL.@) + */ +int CDECL NTDLL___iscsymf(int c) +{ + return (c < 127 && (isalpha(c) || c == '_')); +} + + +/********************************************************************* + * _toupper (NTDLL.@) + */ +int CDECL NTDLL__toupper(int c) +{ + return c - 0x20; /* sic */ +} + + +/********************************************************************* + * _tolower (NTDLL.@) + */ +int CDECL NTDLL__tolower(int c) +{ + return c + 0x20; /* sic */ +} + + +/********************************************************************* * strtol (NTDLL.@) */ LONG __cdecl NTDLL_strtol( const char *nptr, char **endptr, int base )

1 0

Alexandre Julliard : msvcrt: Synchronize spec files.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 799731f4b9e9495181e18a68eba16c9219db73fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=799731f4b9e9495181e18a68e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:18:03 2013 +0100 msvcrt: Synchronize spec files. --- dlls/crtdll/crtdll.spec | 6 +- dlls/msvcirt/msvcirt.spec | 12 ++-- dlls/msvcr100/msvcr100.spec | 80 ++++++++++++++++---------------- dlls/msvcr110/msvcr110.spec | 110 +++++++++++++++++++++--------------------- dlls/msvcr70/msvcr70.spec | 68 +++++++++++++------------- dlls/msvcr71/msvcr71.spec | 68 +++++++++++++------------- dlls/msvcr80/msvcr80.spec | 30 ++++++------ dlls/msvcr90/msvcr90.spec | 80 ++++++++++++++++---------------- dlls/msvcrt20/msvcrt20.spec | 14 +++--- dlls/msvcrt40/msvcrt40.spec | 58 +++++++++++----------- dlls/msvcrtd/msvcrtd.spec | 62 ++++++++++++------------ tools/make_specfiles | 1 + 12 files changed, 295 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=799731f4b9e9495181e18…

1 0

Jacek Caban : msctf.idl: Added ITfContextOwnerServices declaration.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 9e5b4eb0565028313bf7355d910f09388668a14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5b4eb0565028313bf7355d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 13:03:50 2013 +0100 msctf.idl: Added ITfContextOwnerServices declaration. --- include/msctf.idl | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index a1a6f17..a67dbc1 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -106,6 +106,16 @@ cpp_quote("#if 0") typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; cpp_quote("#endif") +typedef [uuid(e26d9e1d-691e-4f29-90d7-338dcf1f8cef)] struct TF_PERSISTENT_PROPERTY_HEADER_ACP +{ + GUID guidType; + LONG ichStart; + LONG cch; + ULONG cb; + DWORD dwPrivate; + CLSID clsidTIP; +} TF_PERSISTENT_PROPERTY_HEADER_ACP; + typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { CLSID clsid; @@ -1301,6 +1311,51 @@ interface ITfContextOwnerCompositionServices : ITfContextComposition [ object, + uuid(4ef89150-0807-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface ITfPersistentPropertyLoaderACP : IUnknown +{ + HRESULT LoadProperty( + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [out] IStream **ppStream); +} + +[ + object, + uuid(b23eb630-3e1c-11d3-a745-0050040ab407), + pointer_default(unique) +] +interface ITfContextOwnerServices : IUnknown +{ + HRESULT OnLayoutChange(); + + HRESULT OnStatusChange([in] DWORD dwFlags); + + HRESULT OnAttributeChange([in] REFGUID rguidAttribute); + + HRESULT Serialize( + [in] ITfProperty *pProp, + [in] ITfRange *pRange, + [out] TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [in] IStream *pStream); + + HRESULT Unserialize( + [in] ITfProperty *pProp, + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [in] IStream *pStream, + [in] ITfPersistentPropertyLoaderACP *pLoader); + + HRESULT ForceLoadProperty([in] ITfProperty *pProp); + + HRESULT CreateRange( + [in] LONG acpStart, + [in] LONG acpEnd, + [out] ITfRangeACP **ppRange); +} + +[ + object, uuid(17d49a3d-f8b8-4b2f-b254-52319dd64c53), pointer_default(unique) ]

1 0

Huw Davies : usp10: Don't read past the end of the context_type array.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 28adfd4c3ce5be8194c42b67c8a5fbaddb3ab137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28adfd4c3ce5be8194c42b67c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 14 15:48:26 2013 +0000 usp10: Don't read past the end of the context_type array. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d30a615..91637d1 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -931,7 +931,7 @@ static void mark_invalid_combinations(HDC hdc, const WCHAR* pwcChars, INT cChars context_type[i] = lex(pwcChars[i]); GetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0); - for (i = 1, g=1; i < cChars; i++, g++) + for (i = 1, g=1; i < cChars - 1; i++, g++) { if (context_type[i] != 0 && context_type[i+write_dir]==context_type[i]) {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 9d8b39cf5ee5af87c3c10f0d3ab671a3ac8ad2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d8b39cf5ee5af87c3c10f0d3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 14 15:52:43 2013 +0200 po: Update Finnish translation. --- po/fi.po | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/po/fi.po b/po/fi.po index f559383..9eff294 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10406,77 +10406,59 @@ msgstr "Vieraita protokollia" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "TCP-tilastot IPv4:lle" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "Aktiiviset yhteydet" +msgstr "Aktiivisia avauksia" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Passiivisia avauksia" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "Aktiiviset yhteydet" +msgstr "Epäonnistuneita yhteysyrityksiä" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "Aktiiviset yhteydet" +msgstr "Nollattuja yhteyksiä" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "Aktiiviset yhteydet" +msgstr "Yhteyksiä nyt" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segmentti lukittu.\n" +msgstr "Segmenttejä vastaanotettu" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segmentti lukittu.\n" +msgstr "Segmenttejä lähetetty" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Segmenttejä lähetetty uudelleen" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "UDP-tilastot IPv4:lle" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segmentti lukittu.\n" +msgstr "Datagrammeja vastaanotettu" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Paikallinen portti" +msgstr "Kohdeporttivirheitä" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Virhe dekoodauksessa" +msgstr "Vastaanottovirheitä" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Datagrammeja lähetetty" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Nikolay Sivov : xmllite: Implement ReadValueChunk().
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: b1d7517ab1cc7dc241d4d6d624b4a67d0d5f7586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d7517ab1cc7dc241d4d6d62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 15:08:29 2013 +0400 xmllite: Implement ReadValueChunk(). --- dlls/xmllite/reader.c | 152 +++++++++++++++++++++++++++---------------- dlls/xmllite/tests/reader.c | 6 +-- 2 files changed, 97 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1d7517ab1cc7dc241d4d…

1 0

Alexandre Julliard : ntoskrnl: Synchronize spec file with ntdll and msvcrt.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 0a3cc8b85d2411c7bb8cd5640f8ccccb8e2be526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3cc8b85d2411c7bb8cd5640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:57:33 2013 +0100 ntoskrnl: Synchronize spec file with ntdll and msvcrt. --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 82 +++++++++++++++++----------------- tools/make_specfiles | 9 ++++ 2 files changed, 50 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a3cc8b85d2411c7bb8cd…

1 0

Alexandre Julliard : ntdll: Copy some missing math functions from msvcrt.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 17be935568ed630f4a7a53c345dbe533ee61b1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=17be935568ed630f4a7a53c34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:43:46 2013 +0100 ntdll: Copy some missing math functions from msvcrt. --- dlls/ntdll/misc.c | 129 ++++++++++++++++++++++++------------------------- dlls/ntdll/ntdll.spec | 8 ++-- 2 files changed, 67 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index fecd67e..c115c9c 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -53,72 +53,6 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) } /********************************************************************* - * _ftol (NTDLL.@) - * - * VERSION - * [GNUC && i386] - */ -#if defined(__GNUC__) && defined(__i386__) -LONGLONG CDECL NTDLL__ftol(void) -{ - /* don't just do DO_FPU("fistp",retval), because the rounding - * mode must also be set to "round towards zero"... */ - double fl; - POP_FPU(fl); - return (LONGLONG)fl; -} -#endif /* defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* - * _ftol (NTDLL.@) - * - * FIXME - * Should be register function - * VERSION - * [!GNUC && i386] - */ -#if !defined(__GNUC__) && defined(__i386__) -LONGLONG CDECL NTDLL__ftol(double fl) -{ - FIXME("should be register function\n"); - return (LONGLONG)fl; -} -#endif /* !defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* - * _CIpow (NTDLL.@) - * VERSION - * [GNUC && i386] - */ -#if defined(__GNUC__) && defined(__i386__) -double CDECL NTDLL__CIpow(void) -{ - double x,y; - POP_FPU(y); - POP_FPU(x); - return pow(x,y); -} -#endif /* defined(__GNUC__) && defined(__i386__) */ - - -/********************************************************************* - * _CIpow (NTDLL.@) - * - * FIXME - * Should be register function - * - * VERSION - * [!GNUC && i386] - */ -#if !defined(__GNUC__) && defined(__i386__) -double CDECL NTDLL__CIpow(double x,double y) -{ - FIXME("should be register function\n"); - return pow(x,y); -} -#endif /* !defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* * wine_get_version (NTDLL.@) */ const char * CDECL NTDLL_wine_get_version(void) @@ -252,6 +186,69 @@ double CDECL NTDLL_tan( double d ) return tan( d ); } +#if defined(__GNUC__) && defined(__i386__) + +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) + +/********************************************************************* + * _CIcos (NTDLL.@) + */ +double CDECL NTDLL__CIcos(void) +{ + FPU_DOUBLE(x); + return NTDLL_cos(x); +} + +/********************************************************************* + * _CIlog (NTDLL.@) + */ +double CDECL NTDLL__CIlog(void) +{ + FPU_DOUBLE(x); + return NTDLL_log(x); +} + +/********************************************************************* + * _CIpow (NTDLL.@) + */ +double CDECL NTDLL__CIpow(void) +{ + FPU_DOUBLES(x,y); + return NTDLL_pow(x,y); +} + +/********************************************************************* + * _CIsin (NTDLL.@) + */ +double CDECL NTDLL__CIsin(void) +{ + FPU_DOUBLE(x); + return NTDLL_sin(x); +} + +/********************************************************************* + * _CIsqrt (NTDLL.@) + */ +double CDECL NTDLL__CIsqrt(void) +{ + FPU_DOUBLE(x); + return NTDLL_sqrt(x); +} + +/********************************************************************* + * _ftol (NTDLL.@) + */ +LONGLONG CDECL NTDLL__ftol(void) +{ + FPU_DOUBLE(x); + return (LONGLONG)x; +} + +#endif /* defined(__GNUC__) && defined(__i386__) */ static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 19ff8e4..d144986 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1240,11 +1240,11 @@ @ stub ZwWriteRequestData @ stdcall ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory @ stdcall ZwYieldExecution() NtYieldExecution -# @ stub _CIcos -# @ stub _CIlog +@ cdecl -private -arch=i386 _CIcos() NTDLL__CIcos +@ cdecl -private -arch=i386 _CIlog() NTDLL__CIlog @ cdecl -private -arch=i386 _CIpow() NTDLL__CIpow -# @ stub _CIsin -# @ stub _CIsqrt +@ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin +@ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=x86_64 -norelay __chkstk() # @ stub __isascii

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement stub implementation.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 78b579dff22701febf5dd8948eb3dfc9bcdb810b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b579dff22701febf5dd8948… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 17:52:34 2013 +0100 mshtml: Added IHTMLButtonElement stub implementation. --- dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlinput.c | 229 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 +++- 4 files changed, 247 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78b579dff22701febf5dd…

1 0

Nikolay Sivov : msxml3: Use characters callback helper in one more place.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 81ffe0432e474d83a8a4d88421c18e47c09e3708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ffe0432e474d83a8a4d8842… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 08:27:57 2013 +0400 msxml3: Use characters callback helper in one more place. --- dlls/msxml3/saxreader.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5475e1a..5a0b1c2 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -349,6 +349,21 @@ static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandl return (locator->vbInterface && iface->vbhandler) || (!locator->vbInterface && iface->handler); } +static HRESULT saxreader_saxcharacters(saxlocator *locator, BSTR chars) +{ + struct saxcontenthandler_iface *content = saxreader_get_contenthandler(locator->saxreader); + HRESULT hr; + + if (!saxreader_has_handler(locator, SAXContentHandler)) return S_OK; + + if (locator->vbInterface) + hr = IVBSAXContentHandler_characters(content->vbhandler, &chars); + else + hr = ISAXContentHandler_characters(content->handler, chars, SysStringLen(chars)); + + return hr; +} + /* property names */ static const WCHAR PropertyCharsetW[] = { 'c','h','a','r','s','e','t',0 @@ -1565,7 +1580,6 @@ static void libxmlCharacters( int len) { saxlocator *This = ctx; - struct saxcontenthandler_iface *handler = saxreader_get_contenthandler(This->saxreader); BSTR Chars; HRESULT hr; xmlChar *cur, *end; @@ -1624,10 +1638,7 @@ static void libxmlCharacters( } Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur); - if(This->vbInterface) - hr = IVBSAXContentHandler_characters(handler->vbhandler, &Chars); - else - hr = ISAXContentHandler_characters(handler->handler, Chars, SysStringLen(Chars)); + hr = saxreader_saxcharacters(This, Chars); if (sax_callback_failed(This, hr)) { @@ -1799,21 +1810,6 @@ static BSTR saxreader_get_cdata_chunk(const xmlChar *str, int len) return ret; } -static HRESULT saxreader_saxcharacters(saxlocator *locator, BSTR chars) -{ - struct saxcontenthandler_iface *content = saxreader_get_contenthandler(locator->saxreader); - HRESULT hr; - - if (!saxreader_has_handler(locator, SAXContentHandler)) return S_OK; - - if (locator->vbInterface) - hr = IVBSAXContentHandler_characters(content->vbhandler, &chars); - else - hr = ISAXContentHandler_characters(content->handler, chars, SysStringLen(chars)); - - return hr; -} - static void libxml_cdatablock(void *ctx, const xmlChar *value, int len) { const xmlChar *start, *end;

1 0

Ken Thomases : winemac: Extract new function from macdrv_IsClipboardFormatAvailable() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: caf6db7bf981e929851e8807dda4f2fead3bdee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf6db7bf981e929851e8807d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:21 2013 -0500 winemac: Extract new function from macdrv_IsClipboardFormatAvailable() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 79 +++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4197515..fa4857b 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1324,6 +1324,49 @@ static HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_form /************************************************************************** + * macdrv_pasteboard_has_format + */ +static BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) +{ + CFArrayRef types; + int count; + UINT i; + BOOL found = FALSE; + + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return FALSE; + } + + count = CFArrayGetCount(types); + TRACE("got %d types\n", count); + + for (i = 0; !found && i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while (!found && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); + + if (format->format_id == desired_format) + found = TRUE; + } + } + + CFRelease(types); + TRACE(" -> %d\n", found); + return found; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1558,42 +1601,8 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) { - CFArrayRef types; - int count; - UINT i; - BOOL found = FALSE; - - TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return FALSE; - } - - count = CFArrayGetCount(types); - TRACE("got %d types\n", count); - - for (i = 0; !found && i < count; i++) - { - CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT* format; - - format = NULL; - while (!found && (format = format_for_type(format, type))) - { - TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); - - if (format->format_id == desired_format) - found = TRUE; - } - } - - CFRelease(types); - TRACE(" -> %d\n", found); - return found; + return macdrv_pasteboard_has_format(NULL, desired_format); }

1 0

Ken Thomases : winemac: Extract new function from macdrv_GetClipboardData() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: c8e6bad15338252b5d93d542feda93b747189871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e6bad15338252b5d93d542f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:16 2013 -0500 winemac: Extract new function from macdrv_GetClipboardData() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 126 ++++++++++++++++++++++------------------- 1 files changed, 68 insertions(+), 58 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4a6f859..4197515 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1257,6 +1257,73 @@ static BOOL release_ownership(void) /************************************************************************** + * macdrv_get_pasteboard_data + */ +static HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + CFStringRef type, best_type; + WINE_CLIPFORMAT* best_format = NULL; + HANDLE data = NULL; + + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) + { + WINE_CLIPFORMAT* format; + + type = CFArrayGetValueAtIndex(types, i); + + format = NULL; + while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); + + if (format->format_id == desired_format) + { + /* The best format is the matching one which is not synthesized. Failing that, + the best format is the first matching synthesized format. */ + if (!format->synthesized || !best_format) + { + best_type = type; + best_format = format; + } + } + } + } + + if (best_format) + { + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(pasteboard, best_type); + + TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); + + if (pasteboard_data) + { + data = best_format->import_func(pasteboard_data); + CFRelease(pasteboard_data); + } + } + + CFRelease(types); + TRACE(" -> %p\n", data); + return data; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1480,66 +1547,9 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) */ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) { - CFArrayRef types; - CFIndex count; - CFIndex i; - CFStringRef type, best_type; - WINE_CLIPFORMAT* best_format = NULL; - HANDLE data = NULL; - - TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return NULL; - } - - count = CFArrayGetCount(types); - TRACE("got %ld types\n", count); - - for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) - { - WINE_CLIPFORMAT* format; - - type = CFArrayGetValueAtIndex(types, i); - - format = NULL; - while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) - { - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); - - if (format->format_id == desired_format) - { - /* The best format is the matching one which is not synthesized. Failing that, - the best format is the first matching synthesized format. */ - if (!format->synthesized || !best_format) - { - best_type = type; - best_format = format; - } - } - } - } - - if (best_format) - { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(NULL, best_type); - - TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); - - if (pasteboard_data) - { - data = best_format->import_func(pasteboard_data); - CFRelease(pasteboard_data); - } - } - - CFRelease(types); - TRACE(" -> %p\n", data); - return data; + return macdrv_get_pasteboard_data(NULL, desired_format); }

1 0

Alexandre Julliard : msvcrt: Use -arch=i386 everywhere for consistency.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 866034c1ef16b8b2eb52c2d03d4a088bbc07b93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=866034c1ef16b8b2eb52c2d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:17:52 2013 +0100 msvcrt: Use -arch=i386 everywhere for consistency. --- dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d5cc428..b6ae261 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ # stub _CrtSetReportHook2 # stub _CrtSetReportMode @ stdcall _CxxThrowException(long long) -@ cdecl -i386 -norelay _EH_prolog() +@ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() @@ -181,7 +181,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -@ stdcall -i386 __CxxLongjmpUnwind(ptr) +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() # stub __CxxRegisterExceptionObject # stub __CxxUnregisterExceptionObject @@ -352,7 +352,7 @@ @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign @ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf -@ cdecl -i386 -norelay _chkesp() +@ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize # stub _chsize_s(long int64) @@ -412,9 +412,9 @@ @ extern _environ MSVCRT__environ @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -532,7 +532,7 @@ # stub _getwch() # stub _getwche() @ cdecl _getws(ptr) MSVCRT__getws -@ cdecl -i386 _global_unwind2(ptr) +@ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime32(ptr) MSVCRT__gmtime32 @ cdecl _gmtime32_s(ptr ptr) MSVCRT__gmtime32_s @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 @@ -654,8 +654,8 @@ # stub _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) -@ cdecl -i386 _local_unwind2(ptr long) -@ cdecl -i386 _local_unwind4(ptr ptr long) +@ cdecl -arch=i386 _local_unwind2(ptr long) +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 @ cdecl _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) MSVCRT__localtime64 @@ -665,7 +665,7 @@ @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf -@ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp +@ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) @@ -885,8 +885,8 @@ # stub _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) MSVCRT__searchenv @ cdecl _searchenv_s(str str ptr long) -@ stdcall -i386 _seh_longjmp_unwind4(ptr) -@ stdcall -i386 _seh_longjmp_unwind(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long)

1 0

Dmitry Timoshkov : gdiplus: Add more GdipMeasureString/ GdipMeasureCharacterRanges clipping and alignment tests.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 4b19b618f5e202ed8a0ea121869a3bb3a2d2f20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b19b618f5e202ed8a0ea1218… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 14 16:35:11 2013 +0900 gdiplus: Add more GdipMeasureString/GdipMeasureCharacterRanges clipping and alignment tests. --- dlls/gdiplus/tests/graphics.c | 201 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 193 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e41751a..fe525b6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3909,7 +3909,7 @@ static void test_measure_string(void) static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; - CharacterRange range = { 0, 3 }; + CharacterRange range; GpRegion *region; GpGraphics *graphics; GpFontFamily *family; @@ -3923,8 +3923,7 @@ static void test_measure_string(void) status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); expect(Ok, status); - status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); - expect(Ok, status); + status = GdipCreateRegion(&region); expect(Ok, status); @@ -3964,8 +3963,123 @@ static void test_measure_string(void) todo_wine expectf(height / 2.0, bounds.Height); + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + range.First = 0; + range.Length = 1; + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + set_rect_empty(&rect); + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, 1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(margin_x, bounds.X, 1.0); + expectf(0.0, bounds.Y); + ok(bounds.Width < width_rgn / 2.0, "width of 1 glyph is wrong\n"); + expectf(height_rgn, bounds.Height); + width_1 = bounds.Width; + + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(0.0, bounds.Width); + expectf(0.0, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf_(width_1, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf(width_rgn, bounds.Width); +todo_wine + expectf(height_rgn, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf_(width_1, bounds.Width, 1.0); +todo_wine + expectf(height_rgn, bounds.Height); + set_rect_empty(&rect); rect.Height = height / 2.0; set_rect_empty(&bounds); @@ -3975,7 +4089,7 @@ todo_wine expect(1, lines); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); todo_wine expectf(height, bounds.Height); @@ -4042,6 +4156,7 @@ todo_wine expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + /* Default (Near) alignment */ rect.X = 5.0; rect.Y = 5.0; rect.Width = width * 2.0; @@ -4053,7 +4168,7 @@ todo_wine expect(1, lines); expectf(5.0, bounds.X); expectf(5.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4074,6 +4189,7 @@ todo_wine width_rgn = bounds.Width; height_rgn = bounds.Height; + /* Center alignment */ GdipSetStringFormatAlign(format, StringAlignmentCenter); GdipSetStringFormatLineAlign(format, StringAlignmentCenter); @@ -4090,7 +4206,23 @@ todo_wine expectf_(5.0 + width/2.0, bounds.X, 0.01); todo_wine expectf(5.0 + height/2.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 - height/2.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4108,6 +4240,25 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); +todo_wine + expectf_(width_rgn, bounds.Width, 1.0); +todo_wine + expectf_(height_rgn, bounds.Height, 1.0); + + /* Far alignment */ GdipSetStringFormatAlign(format, StringAlignmentFar); GdipSetStringFormatLineAlign(format, StringAlignmentFar); @@ -4121,10 +4272,26 @@ todo_wine expect(3, glyphs); expect(1, lines); todo_wine - expectf(5.0 + width, bounds.X); + expectf_(5.0 + width, bounds.X, 0.01); todo_wine expectf(5.0 + height, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width, bounds.X, 0.01); +todo_wine + expectf(5.0 - height, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4143,6 +4310,24 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 - height_rgn, bounds.Y, 1.0); +todo_wine + expectf_(width_rgn, bounds.Width, 1.0); +todo_wine + expectf_(height_rgn, bounds.Height, 1.0); + status = GdipDeleteFont(font); expect(Ok, status);

1 0

Ken Thomases : winemac: Implement support for drag-and-drop.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 7993bd3d9010d752704fd25e16ea775852540b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7993bd3d9010d752704fd25e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:32 2013 -0500 winemac: Implement support for drag-and-drop. --- dlls/winemac.drv/Makefile.in | 4 +- dlls/winemac.drv/clipboard.c | 8 +- dlls/winemac.drv/cocoa_event.m | 17 +- dlls/winemac.drv/cocoa_window.m | 74 +++++ dlls/winemac.drv/dragdrop.c | 635 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 12 + dlls/winemac.drv/macdrv.h | 8 + dlls/winemac.drv/macdrv_cocoa.h | 29 ++ 8 files changed, 780 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7993bd3d9010d752704fd…

1 0

Ken Thomases : winemac: Extract new function from macdrv_EnumClipboardFormats() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: fb5794a764b302bce91f938d8fdef396ac8d6922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5794a764b302bce91f938d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:27 2013 -0500 winemac: Extract new function from macdrv_EnumClipboardFormats() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 159 +++++++++++++++++++++++++----------------- 1 files changed, 96 insertions(+), 63 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fa4857b..40445f6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1367,6 +1367,79 @@ static BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_form /************************************************************************** + * macdrv_copy_pasteboard_formats + */ +static CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) +{ + CFArrayRef types; + CFIndex count; + CFMutableArrayRef formats; + CFIndex i; + + TRACE("pasteboard %p\n", pasteboard); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + if (!count) + { + CFRelease(types); + return NULL; + } + + formats = CFArrayCreateMutable(NULL, 0, NULL); + if (!formats) + { + WARN("Failed to allocate formats array\n"); + CFRelease(types); + return NULL; + } + + for (i = 0; i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while ((format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + + if (format->synthesized) + { + /* Don't override a real value with a synthesized value. */ + if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + CFArrayAppendValue(formats, (void*)format->format_id); + } + else + { + /* If the type was already in the array, it must have been synthesized + because this one's real. Remove the synthesized entry in favor of + this one. */ + CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), + (void*)format->format_id); + if (index != kCFNotFound) + CFArrayRemoveValueAtIndex(formats, index); + CFArrayAppendValue(formats, (void*)format->format_id); + } + } + } + + CFRelease(types); + + TRACE(" -> %s\n", debugstr_cf(formats)); + return formats; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1498,88 +1571,48 @@ void CDECL macdrv_EndClipboardUpdate(void) */ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) { - CFArrayRef types; CFIndex count; CFIndex i; - UINT ret; + UINT ret = 0; TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return 0; - } - - count = CFArrayGetCount(types); - TRACE("got %ld types\n", count); - - if (!count) - { - CFRelease(types); - return 0; - } - if (prev_format) { - CFMutableArrayRef formats = CFArrayCreateMutable(NULL, 0, NULL); - if (!formats) + CFArrayRef formats = macdrv_copy_pasteboard_formats(NULL); + if (formats) { - WARN("Failed to allocate array to track formats\n"); - CFRelease(types); - return 0; - } + count = CFArrayGetCount(formats); + i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); + if (i != kCFNotFound && i + 1 < count) + ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); - for (i = 0; i < count; i++) + CFRelease(formats); + } + } + else + { + CFArrayRef types = macdrv_copy_pasteboard_types(NULL); + if (types) { - CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT* format; + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); - format = NULL; - while ((format = format_for_type(format, type))) + if (count) { - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + CFStringRef type = CFArrayGetValueAtIndex(types, 0); + WINE_CLIPFORMAT *format = format_for_type(NULL, type); - if (format->synthesized) - { - /* Don't override a real value with a synthesized value. */ - if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) - CFArrayAppendValue(formats, (void*)format->format_id); - } - else - { - /* If the type was already in the array, it must have been synthesized - because this one's real. Remove the synthesized entry in favor of - this one. */ - CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), - (void*)format->format_id); - if (index != kCFNotFound) - CFArrayRemoveValueAtIndex(formats, index); - CFArrayAppendValue(formats, (void*)format->format_id); - } + ret = format ? format->format_id : 0; } - } - count = CFArrayGetCount(formats); - i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); - if (i == kCFNotFound || i + 1 >= count) - ret = 0; + CFRelease(types); + } else - ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); - - CFRelease(formats); + WARN("Failed to copy pasteboard types\n"); } - else - { - CFStringRef type = CFArrayGetValueAtIndex(types, 0); - WINE_CLIPFORMAT *format = format_for_type(NULL, type); - ret = format ? format->format_id : 0; - } - - CFRelease(types); TRACE(" -> %u\n", ret); return ret; }

1 0

Ken Thomases : winemac: Add support for CF_DIB and CF_BITMAP clipboard formats.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 6528619494264d2659039c04ba8a5fa626c99982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6528619494264d2659039c04b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:36 2013 -0500 winemac: Add support for CF_DIB and CF_BITMAP clipboard formats. --- dlls/winemac.drv/clipboard.c | 242 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 242 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6528619494264d2659039…

1 0

Ken Thomases : winemac: Add clipboard formats which can or must be put on Mac pasteboard without transformation .
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: a8d55288de3add7e568d6177bd9dd6ed0c59cef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d55288de3add7e568d6177b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:31 2013 -0500 winemac: Add clipboard formats which can or must be put on Mac pasteboard without transformation. --- dlls/winemac.drv/clipboard.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3e5e9b3..36e0759 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -141,6 +141,21 @@ static const struct BOOL synthesized; } builtin_format_ids[] = { + { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPBITMAP, CFSTR("org.winehq.builtin.dspbitmap"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPENHMETAFILE, CFSTR("org.winehq.builtin.dspenhmetafile"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPMETAFILEPICT, CFSTR("org.winehq.builtin.dspmetafilepict"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPTEXT, CFSTR("org.winehq.builtin.dsptext"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_LOCALE, CFSTR("org.winehq.builtin.locale"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_OWNERDISPLAY, CFSTR("org.winehq.builtin.ownerdisplay"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_PALETTE, CFSTR("org.winehq.builtin.palette"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_PENDATA, CFSTR("org.winehq.builtin.pendata"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_RIFF, CFSTR("org.winehq.builtin.riff"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_SYLK, CFSTR("org.winehq.builtin.sylk"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_TIFF, CFSTR("public.tiff"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_WAVE, CFSTR("com.microsoft.waveform-audio"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_UNICODETEXT, CFSTR("org.winehq.builtin.unicodetext"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_TEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_text, NULL, TRUE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_oemtext, NULL, TRUE }, @@ -158,6 +173,24 @@ static const struct { CF_OEMTEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_oemtext, export_oemtext_to_utf8, TRUE }, }; +static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; +static const WCHAR wszGIF[] = {'G','I','F',0}; +static const WCHAR wszJFIF[] = {'J','F','I','F',0}; +static const WCHAR wszPNG[] = {'P','N','G',0}; +static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; +static const struct +{ + LPCWSTR name; + CFStringRef type; +} builtin_format_names[] = +{ + { wszRichTextFormat, CFSTR("public.rtf") }, + { wszGIF, CFSTR("com.compuserve.gif") }, + { wszJFIF, CFSTR("public.jpeg") }, + { wszPNG, CFSTR("public.png") }, + { wszHTMLFormat, CFSTR("public.html") }, +}; + /* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */ static const WCHAR mac_type_name_prefix[] = {'o','r','g','.','w','i','n','e','h','q','.','m','a','c','-','t','y','p','e','.',0}; @@ -1224,6 +1257,11 @@ void macdrv_clipboard_process_attach(void) format->synthesized = builtin_format_ids[i].synthesized; list_add_tail(&format_list, &format->entry); } + + /* Register known mappings between Windows formats and Mac types */ + for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) + insert_clipboard_format(RegisterClipboardFormatW(builtin_format_names[i].name), + builtin_format_names[i].type); }

1 0

Jactry Zeng : atl100: Added AtlSetPerUserRegistration stub implementation.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 50e323502eba519c1d1d45bf33857646dee406a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e323502eba519c1d1d45bf3… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Mar 14 00:36:14 2013 +0800 atl100: Added AtlSetPerUserRegistration stub implementation. --- dlls/atl100/atl.c | 9 +++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index ebb47a1..0e21963 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -743,6 +743,15 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, } /*********************************************************************** + * AtlSetPerUserRegistration [atl100.67] + */ +HRESULT WINAPI AtlSetPerUserRegistration(cpp_bool bEnable) +{ + FIXME("stub: bEnable: %d\n", bEnable); + return E_NOTIMPL; +} + +/*********************************************************************** * AtlGetPerUserRegistration [atl100.68] */ HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index fa5d251..183ab7b 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -48,5 +48,5 @@ 64 stdcall AtlCallTermFunc(ptr) 65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm -67 stub AtlSetPerUserRegistration +67 stdcall AtlSetPerUserRegistration(long) 68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/include/atlbase.h b/include/atlbase.h index 1036b10..1f91f55 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -259,6 +259,7 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlSetPerUserRegistration(unsigned char /*bool*/); HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

1 0

Ken Thomases : winemac: Add support for CF_HDROP clipboard format, mapped to/from Cocoa's NSFilenamesPboardType.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: bff19b173904392e6c64fdfa78df5695e591d41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff19b173904392e6c64fdfa7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:50 2013 -0500 winemac: Add support for CF_HDROP clipboard format, mapped to/from Cocoa's NSFilenamesPboardType. --- dlls/winemac.drv/clipboard.c | 218 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 5829ca2..2219df6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -26,6 +26,8 @@ #include "macdrv.h" #include "winuser.h" +#include "shellapi.h" +#include "shlobj.h" #include "wine/list.h" #include "wine/server.h" #include "wine/unicode.h" @@ -70,6 +72,7 @@ typedef struct static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); +static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); static HANDLE import_oemtext_to_unicodetext(CFDataRef data); static HANDLE import_text_to_oemtext(CFDataRef data); @@ -83,6 +86,7 @@ static HANDLE import_utf8_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); +static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); @@ -181,6 +185,9 @@ static const struct { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, { CF_BITMAP, CFSTR("com.microsoft.bmp"), import_bmp_to_bitmap, export_bitmap_to_bmp, TRUE }, + + { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, }; static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; @@ -671,6 +678,124 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_nsfilenames_to_hdrop + * + * Import NSFilenamesPboardType data, converting the property-list- + * serialized array of path strings to CF_HDROP. + */ +static HANDLE import_nsfilenames_to_hdrop(CFDataRef data) +{ + HDROP hdrop = NULL; + CFArrayRef names; + CFIndex count, i; + size_t len; + char *buffer = NULL; + WCHAR **paths = NULL; + DROPFILES* dropfiles; + UniChar* p; + + TRACE("data %s\n", debugstr_cf(data)); + + names = (CFArrayRef)CFPropertyListCreateWithData(NULL, data, kCFPropertyListImmutable, + NULL, NULL); + if (!names || CFGetTypeID(names) != CFArrayGetTypeID()) + { + WARN("failed to interpret data as a CFArray\n"); + goto done; + } + + count = CFArrayGetCount(names); + + len = 0; + for (i = 0; i < count; i++) + { + CFIndex this_len; + CFStringRef name = (CFStringRef)CFArrayGetValueAtIndex(names, i); + TRACE(" %s\n", debugstr_cf(name)); + if (CFGetTypeID(name) != CFStringGetTypeID()) + { + WARN("non-string in array\n"); + goto done; + } + + this_len = CFStringGetMaximumSizeOfFileSystemRepresentation(name); + if (this_len > len) + len = this_len; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, len); + if (!buffer) + { + WARN("failed to allocate buffer for file-system representations\n"); + goto done; + } + + paths = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(paths[0])); + if (!paths) + { + WARN("failed to allocate array of DOS paths\n"); + goto done; + } + + for (i = 0; i < count; i++) + { + CFStringRef name = (CFStringRef)CFArrayGetValueAtIndex(names, i); + if (!CFStringGetFileSystemRepresentation(name, buffer, len)) + { + WARN("failed to get file-system representation for %s\n", debugstr_cf(name)); + goto done; + } + paths[i] = wine_get_dos_file_name(buffer); + if (!paths[i]) + { + WARN("failed to get DOS path for %s\n", debugstr_a(buffer)); + goto done; + } + } + + len = 1; /* for the terminating null */ + for (i = 0; i < count; i++) + len += strlenW(paths[i]) + 1; + + hdrop = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(*dropfiles) + len * sizeof(WCHAR)); + if (!hdrop || !(dropfiles = GlobalLock(hdrop))) + { + WARN("failed to allocate HDROP\n"); + GlobalFree(hdrop); + hdrop = NULL; + goto done; + } + + dropfiles->pFiles = sizeof(*dropfiles); + dropfiles->pt.x = 0; + dropfiles->pt.y = 0; + dropfiles->fNC = FALSE; + dropfiles->fWide = TRUE; + + p = (WCHAR*)(dropfiles + 1); + for (i = 0; i < count; i++) + { + strcpyW(p, paths[i]); + p += strlenW(p) + 1; + } + *p = 0; + + GlobalUnlock(hdrop); + +done: + if (paths) + { + for (i = 0; i < count; i++) + HeapFree(GetProcessHeap(), 0, paths[i]); + HeapFree(GetProcessHeap(), 0, paths); + } + HeapFree(GetProcessHeap(), 0, buffer); + if (names) CFRelease(names); + return hdrop; +} + + +/************************************************************************** * import_oemtext_to_text * * Import CF_OEMTEXT data, converting the string to CF_TEXT. @@ -924,6 +1049,99 @@ static CFDataRef export_dib_to_bmp(HANDLE data) /************************************************************************** + * export_hdrop_to_filenames + * + * Export CF_HDROP to NSFilenamesPboardType data, which is a CFArray of + * CFStrings (holding Unix paths) which is serialized as a property list. + */ +static CFDataRef export_hdrop_to_filenames(HANDLE data) +{ + CFDataRef ret = NULL; + DROPFILES *dropfiles; + CFMutableArrayRef filenames = NULL; + void *p; + WCHAR *buffer = NULL; + size_t buffer_len = 0; + + TRACE("data %p\n", data); + + if (!(dropfiles = GlobalLock(data))) + { + WARN("failed to lock data %p\n", data); + goto done; + } + + filenames = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); + if (!filenames) + { + WARN("failed to create filenames array\n"); + goto done; + } + + p = (char*)dropfiles + dropfiles->pFiles; + while (dropfiles->fWide ? *(WCHAR*)p : *(char*)p) + { + char *unixname; + CFStringRef filename; + + TRACE(" %s\n", dropfiles->fWide ? debugstr_w(p) : debugstr_a(p)); + + if (dropfiles->fWide) + unixname = wine_get_unix_file_name(p); + else + { + int len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + if (len) + { + if (len > buffer_len) + { + HeapFree(GetProcessHeap(), 0, buffer); + buffer_len = len * 2; + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_len * sizeof(*buffer)); + } + + MultiByteToWideChar(CP_ACP, 0, p, -1, buffer, buffer_len); + unixname = wine_get_unix_file_name(buffer); + } + else + unixname = NULL; + } + if (!unixname) + { + WARN("failed to convert DOS path to Unix: %s\n", + dropfiles->fWide ? debugstr_w(p) : debugstr_a(p)); + goto done; + } + + if (dropfiles->fWide) + p = (WCHAR*)p + strlenW(p) + 1; + else + p = (char*)p + strlen(p) + 1; + + filename = CFStringCreateWithFileSystemRepresentation(NULL, unixname); + HeapFree(GetProcessHeap(), 0, unixname); + if (!filename) + { + WARN("failed to create CFString from Unix path %s\n", debugstr_a(unixname)); + goto done; + } + + CFArrayAppendValue(filenames, filename); + CFRelease(filename); + } + + ret = CFPropertyListCreateData(NULL, filenames, kCFPropertyListXMLFormat_v1_0, 0, NULL); + +done: + HeapFree(GetProcessHeap(), 0, buffer); + GlobalUnlock(data); + if (filenames) CFRelease(filenames); + TRACE(" -> %s\n", debugstr_cf(ret)); + return ret; +} + + +/************************************************************************** * export_oemtext_to_utf8 * * Export CF_OEMTEXT to UTF-8.

1 0

Ken Thomases : winemac: Allow for processing Cocoa events while waiting for query results.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 761ad810d978168edf3fce62dd8aa12f9e945292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ad810d978168edf3fce62d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:57 2013 -0500 winemac: Allow for processing Cocoa events while waiting for query results. --- dlls/winemac.drv/cocoa_app.h | 7 ++++++- dlls/winemac.drv/cocoa_app.m | 16 ++++++++++++++-- dlls/winemac.drv/cocoa_event.h | 1 + dlls/winemac.drv/cocoa_event.m | 22 ++++++++++++++++++++-- dlls/winemac.drv/event.c | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 67f75e1..e15d734 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -26,6 +26,11 @@ #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) +enum { + WineApplicationEventWakeQuery, +}; + + @class WineEventQueue; @class WineWindow; @@ -87,7 +92,7 @@ - (void) windowGotFocus:(WineWindow*)window; - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout; + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents; - (void) keyboardSelectionDidChange; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 5dc3008..7ee009d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -172,13 +172,25 @@ int macdrv_err_on; } } - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents { PerformRequest(NULL); do { - [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; + if (processEvents) + { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask + untilDate:timeout + inMode:NSDefaultRunLoopMode + dequeue:YES]; + if (event) + [NSApp sendEvent:event]; + [pool release]; + } + else + [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; } while (!*done && [timeout timeIntervalSinceNow] >= 0); return *done; diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 56964da..e74875e 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -36,6 +36,7 @@ - (void) postEvent:(const macdrv_event*)inEvent; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout; @end diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index a5f1c1b..c95fac6 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -252,7 +252,7 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea [eventsLock unlock]; } - - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents { macdrv_event event; NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:timeout]; @@ -264,10 +264,15 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea query->done = FALSE; [self postEvent:&event]; - timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate]; + timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate processEvents:processEvents]; return !timedout && query->status; } + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + { + return [self query:query timeout:timeout processEvents:FALSE]; + } + /*********************************************************************** * OnMainThread @@ -470,8 +475,21 @@ void macdrv_set_query_done(macdrv_query *query) macdrv_retain_query(query); OnMainThreadAsync(^{ + NSEvent* event; + query->done = TRUE; macdrv_release_query(query); + + event = [NSEvent otherEventWithType:NSApplicationDefined + location:NSZeroPoint + modifierFlags:0 + timestamp:[[NSProcessInfo processInfo] systemUptime] + windowNumber:0 + context:nil + subtype:WineApplicationEventWakeQuery + data1:0 + data2:0]; + [NSApp postEvent:event atStart:TRUE]; }); } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 512d99e..1fba681 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -240,7 +240,8 @@ DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handle timeout, flags & MWMO_ALERTABLE); } - if (data->current_event) event_mask = 0; /* don't process nested events */ + if (data->current_event && data->current_event->type != QUERY_EVENT) + event_mask = 0; /* don't process nested events */ if (process_events(data->queue, event_mask)) ret = count - 1; else if (count || timeout)

1 0

Ken Thomases : winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert .
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 95d5270a0d852b45198a6466aebcca94ee223798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d5270a0d852b45198a6466a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:43 2013 -0500 winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert. Mac apps generally put TIFF on the pasteboard, but Windows programs are more likely to handle CF_DIB or CF_BITMAP which map to BMP. --- dlls/winemac.drv/cocoa_clipboard.m | 48 ++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 486cbd0..8d29326 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -25,6 +25,10 @@ static int owned_change_count = -1; +static NSArray* BitmapOutputTypes; +static NSDictionary* BitmapOutputTypeMap; +static dispatch_once_t BitmapOutputTypesInitOnce; + /*********************************************************************** * macdrv_is_pasteboard_owner @@ -54,11 +58,43 @@ CFArrayRef macdrv_copy_pasteboard_types(void) __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + dispatch_once(&BitmapOutputTypesInitOnce, ^{ + NSArray* bitmapFileTypes = [NSArray arrayWithObjects: + [NSNumber numberWithUnsignedInteger:NSTIFFFileType], + [NSNumber numberWithUnsignedInteger:NSPNGFileType], + [NSNumber numberWithUnsignedInteger:NSBMPFileType], + [NSNumber numberWithUnsignedInteger:NSGIFFileType], + [NSNumber numberWithUnsignedInteger:NSJPEGFileType], + [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType], + nil]; + + BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", + @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", + @"public.jpeg-2000", nil]; + + BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes + forKeys:BitmapOutputTypes]; + }); + OnMainThread(^{ @try { NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSArray* types = [pb types]; + + // If there are any types understood by NSBitmapImageRep, then we + // can offer all of the types that it can output, too. For example, + // if TIFF is on the pasteboard, we can offer PNG, BMP, etc. to the + // Windows program. We'll convert on demand. + if ([types firstObjectCommonWithArray:[NSBitmapImageRep imageTypes]] || + [types firstObjectCommonWithArray:[NSBitmapImageRep imagePasteboardTypes]]) + { + NSMutableArray* newTypes = [BitmapOutputTypes mutableCopy]; + [newTypes removeObjectsInArray:types]; + types = [types arrayByAddingObjectsFromArray:newTypes]; + [newTypes release]; + } + ret = (CFArrayRef)[types copy]; } @catch (id e) @@ -89,6 +125,18 @@ CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) NSPasteboard* pb = [NSPasteboard generalPasteboard]; if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) ret = [[pb dataForType:(NSString*)type] copy]; + else + { + NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; + if (bitmapType) + { + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + ret = [NSBitmapImageRep representationOfImageRepsInArray:reps + usingType:[bitmapType unsignedIntegerValue] + properties:nil]; + ret = [ret copy]; + } + } } @catch (id e) {

1 0

Alexandre Julliard : msvcrt: Export the float math functions on ARM.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 599d080220bd40a8a076a2a08cb08e64b87f54c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599d080220bd40a8a076a2a08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:06:25 2013 +0100 msvcrt: Export the float math functions on ARM. --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.spec | 54 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4570da0..a55ecb6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -68,7 +68,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef __x86_64__ +#if defined(__x86_64__) || defined(__arm__) /********************************************************************* * _chgsignf (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0bf5ab2..d5cc428 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -351,7 +351,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign -@ cdecl -arch=x86_64 _chgsignf(float) MSVCRT__chgsignf +@ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf @ cdecl -i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -366,7 +366,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign(double double) MSVCRT__copysign -@ cdecl -arch=x86_64 _copysignf(float float) MSVCRT__copysignf +@ cdecl -arch=arm,x86_64 _copysignf(float float) MSVCRT__copysignf @ varargs _cprintf(str) # stub _cprintf_l(str ptr) # stub _cprintf_p(str) @@ -449,7 +449,7 @@ @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite(double) MSVCRT__finite -@ cdecl -arch=x86_64 _finitef(float) MSVCRT__finitef +@ cdecl -arch=arm,x86_64 _finitef(float) MSVCRT__finitef @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @@ -625,7 +625,7 @@ @ cdecl _ismbstrail(ptr ptr) # stub _ismbstrail_l(long ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf +@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @@ -664,7 +664,7 @@ @ cdecl _lock_file(ptr) MSVCRT__lock_file @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb -@ cdecl -arch=x86_64 _logbf(float) MSVCRT__logbf +@ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @@ -834,7 +834,7 @@ # stub -arch=win32 _msize_debug(ptr long) # stub -arch=win64 _msize_dbg(ptr long) @ cdecl _nextafter(double double) MSVCRT__nextafter -@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf +@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf @ cdecl _onexit(ptr) MSVCRT__onexit @ varargs _open(str long) MSVCRT__open @ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle @@ -874,7 +874,7 @@ @ cdecl -arch=i386 _safe_fprem() @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb -@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf +@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf @ varargs _scanf_l(str ptr) MSVCRT__scanf_l @ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l @ varargs _scprintf(str) MSVCRT__scprintf @@ -1238,15 +1238,15 @@ @ cdecl abort() MSVCRT_abort @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos -@ cdecl -arch=x86_64 acosf(float) MSVCRT_acosf +@ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 -@ cdecl -arch=x86_64 asinf(float) MSVCRT_asinf -@ cdecl -arch=x86_64 atanf(float) MSVCRT_atanf -@ cdecl -arch=x86_64 atan2f(float float) MSVCRT_atan2f +@ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf +@ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf +@ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) ntdll.atoi @@ -1256,20 +1256,20 @@ @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil -@ cdecl -arch=x86_64 ceilf(float) MSVCRT_ceilf +@ cdecl -arch=arm,x86_64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr # stub clearerr_s(ptr) @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl cosh(double) MSVCRT_cosh -@ cdecl -arch=x86_64 cosf(float) MSVCRT_cosf -@ cdecl -arch=x86_64 coshf(float) MSVCRT_coshf +@ cdecl -arch=arm,x86_64 cosf(float) MSVCRT_cosf +@ cdecl -arch=arm,x86_64 coshf(float) MSVCRT_coshf @ cdecl ctime(ptr) MSVCRT_ctime @ cdecl difftime(long long) MSVCRT_difftime @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp -@ cdecl -arch=x86_64 expf(float) MSVCRT_expf +@ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf @ cdecl fabs(double) MSVCRT_fabs @ cdecl fclose(ptr) MSVCRT_fclose @ cdecl feof(ptr) MSVCRT_feof @@ -1281,9 +1281,9 @@ @ cdecl fgetwc(ptr) MSVCRT_fgetwc @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor -@ cdecl -arch=x86_64 floorf(float) MSVCRT_floorf +@ cdecl -arch=arm,x86_64 floorf(float) MSVCRT_floorf @ cdecl fmod(double double) MSVCRT_fmod -@ cdecl -arch=x86_64 fmodf(float float) MSVCRT_fmodf +@ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen @ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf @@ -1297,7 +1297,7 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf +@ cdecl -arch=arm,x86_64 frexpf(float ptr) MSVCRT_frexpf @ varargs fscanf(ptr str) MSVCRT_fscanf @ varargs fscanf_s(ptr str) MSVCRT_fscanf_s @ cdecl fseek(ptr long long) MSVCRT_fseek @@ -1349,8 +1349,8 @@ @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 -@ cdecl -arch=x86_64 logf(float) MSVCRT_logf -@ cdecl -arch=x86_64 log10f(float) MSVCRT_log10f +@ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf +@ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen @@ -1371,10 +1371,10 @@ @ cdecl memset(ptr long long) ntdll.memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf -@ cdecl -arch=x86_64 modff(float ptr) MSVCRT_modff +@ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff @ cdecl perror(str) MSVCRT_perror @ cdecl pow(double double) MSVCRT_pow -@ cdecl -arch=x86_64 powf(float float) MSVCRT_powf +@ cdecl -arch=arm,x86_64 powf(float float) MSVCRT_powf @ varargs printf(str) MSVCRT_printf @ varargs printf_s(str) MSVCRT_printf_s @ cdecl putc(long ptr) MSVCRT_putc @@ -1400,12 +1400,12 @@ @ cdecl signal(long long) MSVCRT_signal @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh -@ cdecl -arch=x86_64 sinf(float) MSVCRT_sinf -@ cdecl -arch=x86_64 sinhf(float) MSVCRT_sinhf +@ cdecl -arch=arm,x86_64 sinf(float) MSVCRT_sinf +@ cdecl -arch=arm,x86_64 sinhf(float) MSVCRT_sinhf @ varargs sprintf(ptr str) MSVCRT_sprintf @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s @ cdecl sqrt(double) MSVCRT_sqrt -@ cdecl -arch=x86_64 sqrtf(float) MSVCRT_sqrtf +@ cdecl -arch=arm,x86_64 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s @@ -1444,8 +1444,8 @@ @ cdecl system(str) MSVCRT_system @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh -@ cdecl -arch=x86_64 tanf(float) MSVCRT_tanf -@ cdecl -arch=x86_64 tanhf(float) MSVCRT_tanhf +@ cdecl -arch=arm,x86_64 tanf(float) MSVCRT_tanf +@ cdecl -arch=arm,x86_64 tanhf(float) MSVCRT_tanhf @ cdecl time(ptr) MSVCRT_time @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s

1 0

Alexandre Julliard : msvcrt: Export the ARM version of some mangled names.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 5c4bce668ca0290db6ed89ca8d7eb854f4377214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4bce668ca0290db6ed89ca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 12:41:47 2013 +0100 msvcrt: Export the ARM version of some mangled names. --- dlls/msvcr100/msvcr100.spec | 3 +- dlls/msvcr110/msvcr110.spec | 54 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 78 ++++++++++++++++++++++++++++-------------- 3 files changed, 81 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4bce668ca0290db6ed8…

1 0

André Hentschel : msvcrt: Add setjmp for ARM in spec file.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: b29e56f205727d0f9f79636e1e50efeb47527376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e56f205727d0f9f79636e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 13 20:06:44 2013 +0100 msvcrt: Add setjmp for ARM in spec file. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 019a41a..b558b06 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1769,7 +1769,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 720c056..209cc80 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1422,7 +1422,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2b01fc3..8e5cc9b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1368,7 +1368,7 @@ @ varargs scanf(str) MSVCRT_scanf @ varargs scanf_s(str) MSVCRT_scanf_s @ cdecl setbuf(ptr ptr) MSVCRT_setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @ cdecl signal(long long) MSVCRT_signal

1 0

Ken Thomases : winemac: Enable pasteboard functions to operate on arbitrary pasteboards.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 4ae5b106f80eb29ed0b05b74edf054b622fb7ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5b106f80eb29ed0b05b74e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:04 2013 -0500 winemac: Enable pasteboard functions to operate on arbitrary pasteboards. ... not just the general pasteboard (although the general pasteboard is still the default). --- dlls/winemac.drv/clipboard.c | 12 ++++++------ dlls/winemac.drv/cocoa_clipboard.m | 22 ++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 4 ++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2219df6..4a6f859 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1326,7 +1326,7 @@ INT CDECL macdrv_CountClipboardFormats(void) return 0; } - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1396,7 +1396,7 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1490,7 +1490,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1526,7 +1526,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) if (best_format) { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(NULL, best_type); TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); @@ -1556,7 +1556,7 @@ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1758,7 +1758,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) if (!types) { - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 8d29326..b8ca796 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -53,8 +53,9 @@ int macdrv_is_pasteboard_owner(void) * the pasteboard, or NULL on error. The caller is responsible for * releasing the returned array with CFRelease(). */ -CFArrayRef macdrv_copy_pasteboard_types(void) +CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -79,8 +80,11 @@ CFArrayRef macdrv_copy_pasteboard_types(void) OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - NSArray* types = [pb types]; + NSPasteboard* local_pb = pb; + NSArray* types; + + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + types = [local_pb types]; // If there are any types understood by NSBitmapImageRep, then we // can offer all of the types that it can output, too. For example, @@ -115,22 +119,24 @@ CFArrayRef macdrv_copy_pasteboard_types(void) * if there's no such type on the pasteboard. The caller is responsible * for releasing the returned data object with CFRelease(). */ -CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block NSData* ret = nil; OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) - ret = [[pb dataForType:(NSString*)type] copy]; + NSPasteboard* local_pb = pb; + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + if ([local_pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[local_pb dataForType:(NSString*)type] copy]; else { NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; if (bitmapType) { - NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:local_pb]; ret = [NSBitmapImageRep representationOfImageRepsInArray:reps usingType:[bitmapType unsignedIntegerValue] properties:nil]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index bbd3424..95a3720 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -304,8 +304,8 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ -extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; -extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; +extern CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) DECLSPEC_HIDDEN; extern int macdrv_is_pasteboard_owner(void) DECLSPEC_HIDDEN; extern void macdrv_clear_pasteboard(void) DECLSPEC_HIDDEN; extern int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot: Integrate the WineTestBot with the patches website.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: tools Branch: master Commit: 62142e91529892c3d7a70b842c31158d2ca00203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=62142e91529892c3d7a70b84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:03:36 2013 +0100 testbot: Integrate the WineTestBot with the patches website. This lets the WineTestBot create jobs for each patch sent to wine-patches. However for now the part that sends the results back to the patches website is disabled to preserve compatibility with the old WineTestBot (see WineSendLog.pl). --- testbot/bin/Engine.pl | 65 -------------- testbot/bin/WinePatchesWebGet.pl | 108 ------------------------ testbot/bin/WinePatchesWebNotify.pl | 55 ------------ testbot/bin/WinePatchesWebSubmit.pl | 92 ++++++++++++++++++++ testbot/bin/WineSendLog.pl | 92 ++++++++++---------- testbot/doc/INSTALL.txt | 21 +---- testbot/lib/WineTestBot/Config.pm | 4 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 - testbot/lib/WineTestBot/Engine/Notify.pm | 20 +---- 9 files changed, 146 insertions(+), 315 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=62142e91529892c3d7a7…

1 0

Piotr Caban : wininet: Rename CACHEFILE_ENTRY to entry_header.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9d98ced7eccd200d81d625828c20ae499bca0b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d98ced7eccd200d81d625828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:23 2013 +0100 wininet: Rename CACHEFILE_ENTRY to entry_header. --- dlls/wininet/urlcache.c | 156 +++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d98ced7eccd200d81d62…

1 0

Piotr Caban : wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used .
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9d6843a8c1f0eaa041e49126f3318055976f216f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6843a8c1f0eaa041e49126f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:51 2013 +0100 wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used. --- dlls/wininet/tests/http.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c2607dc..eeec7c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1072,6 +1072,10 @@ static void InternetOpenUrlA_test(void) DWORD size, readbytes, totalbytes=0; BOOL ret; + ret = DeleteUrlCacheEntry(TEST_URL); + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, + "DeleteUrlCacheEntry returned %x, GetLastError() = %d\n", ret, GetLastError()); + myhinternet = InternetOpen("Winetest",0,NULL,NULL,INTERNET_FLAG_NO_CACHE_WRITE); ok((myhinternet != 0), "InternetOpen failed, error %u\n",GetLastError()); size = 0x400; @@ -1093,6 +1097,9 @@ static void InternetOpenUrlA_test(void) InternetCloseHandle(myhttp); InternetCloseHandle(myhinternet); + + ret = DeleteUrlCacheEntry(TEST_URL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "INTERNET_FLAG_NO_CACHE_WRITE flag doesn't work\n"); } static void HttpSendRequestEx_test(void)

1 0

Piotr Caban : wininet: Don't create cache file if it's forbidden.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: bbbc6d119bd353a71dc475d61358372342a388b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbc6d119bd353a71dc475d61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:41 2013 +0100 wininet: Don't create cache file if it's forbidden. --- dlls/wininet/http.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a019095..a3f68ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2261,15 +2261,35 @@ static void commit_cache_entry(http_request_t *req) static void create_cache_entry(http_request_t *req) { + static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0}; + static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; + WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR file_name[MAX_PATH+1]; - BOOL b; + BOOL b = TRUE; /* FIXME: We should free previous cache file earlier */ heap_free(req->cacheFile); CloseHandle(req->hCacheFile); req->hCacheFile = NULL; + if(req->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) + b = FALSE; + + if(b) { + int header_idx = HTTP_GetCustomHeaderIndex(req, szCache_Control, 0, FALSE); + if(header_idx!=-1 && (!strcmpiW(req->custHeaders[header_idx].lpszValue, no_cacheW) + || !strcmpiW(req->custHeaders[header_idx].lpszValue, no_storeW))) + b = FALSE; + } + + if(!b) { + if(!(req->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) + return; + + FIXME("INTERNET_FLAG_NEED_FILE is not supported correctly\n"); + } + b = HTTP_GetRequestURL(req, url); if(!b) { WARN("Could not get URL\n");

1 0

Alexandre Julliard : msi: Avoid intermediate variables when calling create_record.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 33aa647e64bc310575443955131bdcae5c32e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=33aa647e64bc3105754439551… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:47:30 2013 +0100 msi: Avoid intermediate variables when calling create_record. --- dlls/msi/automation.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 0b12e29..228d887 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1203,11 +1203,7 @@ static HRESULT view_invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { - IDispatch *dispatch = NULL; - - if (SUCCEEDED(hr = create_record(msiHandle, &dispatch))) - V_DISPATCH(pVarResult) = dispatch; - else + if (FAILED(hr = create_record(msiHandle, &V_DISPATCH(pVarResult)))) ERR("Failed to create Record object, hresult 0x%08x\n", hr); } else if (ret == ERROR_NO_MORE_ITEMS) @@ -1684,7 +1680,6 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, HRESULT hr; VARIANTARG varg0; MSIHANDLE hrec; - IDispatch* dispatch; if (!(wFlags & DISPATCH_METHOD)) return DISP_E_MEMBERNOTFOUND; @@ -1700,11 +1695,7 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, if (!hrec) return DISP_E_EXCEPTION; - hr = create_record(hrec, &dispatch); - if (SUCCEEDED(hr)) - V_DISPATCH(pVarResult) = dispatch; - - return hr; + return create_record(hrec, &V_DISPATCH(pVarResult)); } static HRESULT InstallerImpl_OpenPackage(AutomationObject* This,

1 0

Alexandre Julliard : exception.h: Android doesn't have sigsetjmp.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 34ff565708e6462940019a8d342ac823220f0794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ff565708e6462940019a8d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:04:38 2013 +0100 exception.h: Android doesn't have sigsetjmp. --- include/wine/exception.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 8b807c1..9f9b339 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -88,7 +88,7 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__ANDROID__) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf) #define siglongjmp(buf,val) longjmp(buf,val)

1 0

Jacek Caban : vbscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9eed654e054520888429fb7ea1c9d8cce1c7c776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eed654e054520888429fb7ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:43:56 2013 +0100 vbscript: Use DEFAULT_UNREACHABLE macro where appropriate. --- dlls/vbscript/compile.c | 7 ++----- dlls/vbscript/global.c | 4 +--- dlls/vbscript/vbdisp.c | 3 +-- dlls/vbscript/vbscript.c | 3 +-- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index fb1974b..c5f3797 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -98,8 +98,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) break; case ARG_NONE: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } } @@ -1398,9 +1397,7 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_PROPSET: invoke_type = VBDISP_SET; break; - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } assert(!desc->entries[invoke_type]); diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9c9cd41..4a5a277 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1010,9 +1010,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA case 4: FIXME("unsupported compare argument %s\n", debugstr_variant(args)); return E_NOTIMPL; - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } if(startv) { diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index f06a5b6..f075163 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -172,8 +172,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f V_BSTR(res) = ret; break; } - default: - assert(0); + DEFAULT_UNREACHABLE; } return S_OK; } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 48dd18c..b594b07 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -216,8 +216,7 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) break; case SCRIPTSTATE_CLOSED: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } }

1 0

Dmitry Timoshkov : gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region .
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 61dafbb7012061fda7a737daf24340ce927ce2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dafbb7012061fda7a737daf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 13 16:30:45 2013 +0900 gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a450ded..eb3f228 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -349,7 +349,7 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) { - return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); + return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); } /* Draw non-premultiplied ARGB data to the given graphics object */

1 0

Alexandre Julliard : winefile: Pass a value instead of a pointer to avoid type mismatch warnings.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: c0e85b9fe6a1d4a58b621e29e0cd0359c2685d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e85b9fe6a1d4a58b621e29e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:47:07 2013 +0100 winefile: Pass a value instead of a pointer to avoid type mismatch warnings. --- programs/winefile/winefile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 23388c1..65f0149 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -465,9 +465,9 @@ static Entry* read_tree_win(Root* root, LPCWSTR path, SORT_ORDER sortOrder, HWND #ifdef __WINE__ -static BOOL time_to_filetime(const time_t* t, FILETIME* ftime) +static BOOL time_to_filetime(time_t t, FILETIME* ftime) { - struct tm* tm = gmtime(t); + struct tm* tm = gmtime(&t); SYSTEMTIME stime; if (!tm) @@ -534,8 +534,8 @@ static void read_directory_unix(Entry* dir, LPCWSTR path) entry->data.nFileSizeHigh = st.st_size >> 32; memset(&entry->data.ftCreationTime, 0, sizeof(FILETIME)); - time_to_filetime(&st.st_atime, &entry->data.ftLastAccessTime); - time_to_filetime(&st.st_mtime, &entry->data.ftLastWriteTime); + time_to_filetime(st.st_atime, &entry->data.ftLastAccessTime); + time_to_filetime(st.st_mtime, &entry->data.ftLastWriteTime); entry->bhfi.nFileIndexLow = ent->d_ino; entry->bhfi.nFileIndexHigh = 0;

1 0

Jacek Caban : jscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 3faeffc5f474db6c835e035734a4dd96999af234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faeffc5f474db6c835e03573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:44:07 2013 +0100 jscript: Use DEFAULT_UNREACHABLE macro where appropriate. --- dlls/jscript/compile.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 84d3d5f..516de49 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -92,8 +92,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) case ARG_FUNC: case ARG_NONE: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } } @@ -447,8 +446,7 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex hres = push_instr_uint(ctx, OP_memberid, flags); break; } - default: - assert(0); + DEFAULT_UNREACHABLE; } return hres; @@ -771,9 +769,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) instr_ptr(ctx, instr)->u.arg[1].uint = literal->u.regexp.flags; return S_OK; } - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } } @@ -797,9 +793,7 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st jsstr_release(jsstr); break; } - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } return *str ? S_OK : E_OUTOFMEMORY; @@ -1050,9 +1044,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL case EXPR_BXOR: hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); break; - default: - assert(0); - hres = E_FAIL; + DEFAULT_UNREACHABLE; } if(FAILED(hres)) @@ -1769,9 +1761,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_WITH: hres = compile_with_statement(ctx, (with_statement_t*)stat); break; - default: - assert(0); - hres = E_FAIL; + DEFAULT_UNREACHABLE; } if(stat_ctx) {

1 0

Andrew Talbot : wininet: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: ae77b3d368519b5518dbe485dfac2e8123b5a477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae77b3d368519b5518dbe485d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 12 22:28:49 2013 +0000 wininet: Avoid signed-unsigned integer comparisons. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 6 +++--- dlls/wininet/netconnection.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 498e848..a019095 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4050,7 +4050,7 @@ static WORD HTTP_ParseWkday(LPCWSTR day) { 't','h','u',0 }, { 'f','r','i',0 }, { 's','a','t',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; @@ -4313,7 +4313,7 @@ static WORD HTTP_ParseWeekday(LPCWSTR day) { 't','h','u','r','s','d','a','y',0 }, { 'f','r','i','d','a','y',0 }, { 's','a','t','u','r','d','a','y',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 384516c..b6e6948 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2836,7 +2836,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_PER_CONNECTION_OPTION: { INTERNET_PER_CONN_OPTION_LISTW *con = lpBuffer; LONG res; - int i; + unsigned int i; proxyinfo_t pi; INTERNET_LoadProxySettings(&pi); @@ -2950,7 +2950,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, wbuffer, wlen ); break; case INTERNET_OPTION_PER_CONNECTION_OPTION: { - int i; + unsigned int i; INTERNET_PER_CONN_OPTION_LISTW *listW; INTERNET_PER_CONN_OPTION_LISTA *listA = lpBuffer; wlen = sizeof(INTERNET_PER_CONN_OPTION_LISTW); @@ -3019,7 +3019,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, if (dwOption == INTERNET_OPTION_PER_CONNECTION_OPTION) { INTERNET_PER_CONN_OPTION_LISTW *list = wbuffer; - int i; + unsigned int i; for (i = 0; i < list->dwOptionCount; ++i) { INTERNET_PER_CONN_OPTIONW *opt = list->pOptions + i; switch (opt->dwOption) { diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3564282..c33f45a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -477,7 +477,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static DWORD init_openssl(void) { #ifdef SONAME_LIBCRYPTO - int i; + unsigned int i; if(OpenSSL_ssl_handle) return ERROR_SUCCESS; @@ -730,7 +730,7 @@ void NETCON_unload(void) } if (ssl_locks) { - int i; + unsigned int i; for (i = 0; i < num_ssl_locks; i++) { ssl_locks[i].DebugInfo->Spare[0] = 0;

1 0

Vincent Povirk : gdiplus: Correct EMF record size calculation.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: a424968482d10356a5987bc08c66061dca5402e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a424968482d10356a5987bc08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:54:41 2013 -0500 gdiplus: Correct EMF record size calculation. --- dlls/gdiplus/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ae905fc..f03557b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -410,7 +410,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (record) { record->iType = recordType; - record->nSize = dataSize; + record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table,

1 0

Piotr Caban : wininet: Rename URL_CACHEFILE_ENTRY to entry_url.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: a448427bf957be91395ed087a3d3d9777ab85a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a448427bf957be91395ed087a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:42 2013 +0100 wininet: Rename URL_CACHEFILE_ENTRY to entry_url. --- dlls/wininet/urlcache.c | 382 +++++++++++++++++++++++------------------------ 1 files changed, 190 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a448427bf957be91395ed…

1 0

Piotr Caban : wininet: Added tests for Cache-Control: no-cache and no-store HTTP headers.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 0e0f06412af753cf1925074fd52f859f27a697b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0f06412af753cf1925074fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:06:01 2013 +0100 wininet: Added tests for Cache-Control: no-cache and no-store HTTP headers. --- dlls/wininet/tests/http.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index eeec7c5..ae7f436 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2015,6 +2015,16 @@ static DWORD CALLBACK server_thread(LPVOID param) WaitForSingleObject(conn_close_event, INFINITE); trace("closing connection\n"); } + if (strstr(buffer, "GET /test_cache_control_no_cache")) + { + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + } + if (strstr(buffer, "GET /test_cache_control_no_store")) + { + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: No-StOrE\r\n\r\nsome content"; + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2474,6 +2484,63 @@ static void test_conn_close(int port) CloseHandle(hCompleteEvent); } +static void test_no_cache(int port) +{ + static const char cache_control_no_cache[] = "/test_cache_control_no_cache"; + static const char cache_control_no_store[] = "/test_cache_control_no_store"; + static const char cache_url_fmt[] = "http://localhost:%d%s"; + + char cache_url[256], buf[256]; + HINTERNET ses, con, req; + DWORD read, size; + BOOL ret; + + trace("Testing no-cache header\n"); + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + req = HttpOpenRequest(con, NULL, cache_control_no_cache, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + sprintf(cache_url, cache_url_fmt, port, cache_control_no_cache); + DeleteUrlCacheEntry(cache_url); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 12, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + ret = DeleteUrlCacheEntry(cache_url); + ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + + req = HttpOpenRequest(con, NULL, cache_control_no_store, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + sprintf(cache_url, cache_url_fmt, port, cache_control_no_store); + DeleteUrlCacheEntry(cache_url); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 12, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + ret = DeleteUrlCacheEntry(cache_url); + ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_HttpSendRequestW(int port) { static const WCHAR header[] = {'U','A','-','C','P','U',':',' ','x','8','6',0}; @@ -2951,6 +3018,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_conn_close(si.port); + test_no_cache(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Nikolay Sivov : msxml3: Process CDATA section before reporting it.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 6874bf3c4ed75c0acb2b1f15fb00278656b44200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6874bf3c4ed75c0acb2b1f15f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 15:04:59 2013 +0400 msxml3: Process CDATA section before reporting it. --- dlls/msxml3/saxreader.c | 155 +++++++++++++++++++++++-------------- dlls/msxml3/tests/saxreader.c | 175 ++++++++++++++++++++++++++++++----------- 2 files changed, 225 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6874bf3c4ed75c0acb2b1…

1 0

Jacek Caban : winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 15448724be0cd8eec6bb137f85c5f226d915a1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15448724be0cd8eec6bb137f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:43:46 2013 +0100 winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro. --- include/winnt.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 0dac8b1..b701de3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -376,8 +376,10 @@ extern "C" { /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200) # define DEFAULT_UNREACHABLE default: __assume(0) +#elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define DEFAULT_UNREACHABLE default: __builtin_unreachable() #else -# define DEFAULT_UNREACHABLE +# define DEFAULT_UNREACHABLE default: #endif /* Error Masks */

1 0

Vincent Povirk : gdiplus: Also get a DC for drawing WMF images.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 6214e5b92cf79eade02fc5abaa72b38ef78c2d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6214e5b92cf79eade02fc5aba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:53:55 2013 -0500 gdiplus: Also get a DC for drawing WMF images. --- dlls/gdiplus/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4345ece..ae905fc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -536,7 +536,9 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, memcpy(real_metafile->playback_points, destPoints, sizeof(PointF) * 3); stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, real_metafile->playback_points, 3); - if (stat == Ok && metafile->metafile_type == MetafileTypeEmf) + if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || + metafile->metafile_type == MetafileTypeWmfPlaceable || + metafile->metafile_type == MetafileTypeWmf)) stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); if (stat == Ok)

1 0

Francois Gouget : testbot: Tighten handling of the VM status in the task scripts.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: aae43a05737a693f784c8a719b6084b44c5411fc URL: http://source.winehq.org/git/tools.git/?a=commit;h=aae43a05737a693f784c8a71… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:52:30 2013 +0100 testbot: Tighten handling of the VM status in the task scripts. --- testbot/bin/WineRunBuild.pl | 15 +++++++++++++-- testbot/bin/WineRunReconfig.pl | 17 ++++++++++++++--- testbot/bin/WineRunTask.pl | 15 ++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 236d3d0..3f5b592 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -217,6 +220,13 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -224,6 +234,7 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $FileName = $Step->FileName; if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7588045..0333705 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -190,13 +193,21 @@ my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $Script = "#!/bin/sh\n" . "rm -f Reconfig.log\n" . "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ffbb421..abb92e0 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -204,9 +204,16 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Step, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; @@ -349,10 +356,8 @@ if (!defined $TestFailures) $Task->TestFailures($TestFailures); $Task->Save(); $Job->UpdateStatus(); -if ($Task->VM->Role ne "base") -{ - $Task->VM->PowerOff(); -} + +$VM->PowerOff() if ($VM->Role ne "base"); $VM->Status('dirty'); $VM->Save();

1 0

Francois Gouget : testbot/build: Staging is handled before starting the build task.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 90a5a8d483a7132871465580f8f841e9fa97eb21 URL: http://source.winehq.org/git/tools.git/?a=commit;h=90a5a8d483a7132871465580… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:08 2013 +0100 testbot/build: Staging is handled before starting the build task. --- testbot/bin/WineRunBuild.pl | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 7fd87b2..236d3d0 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -217,15 +217,8 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } -my $ErrMessage = $Step->HandleStaging($JobId); -if (defined($ErrMessage)) -{ - FatalError "$ErrMessage\n", $FullErrFileName, $Job, $Task; -} - $VM->Status('running'); -my $ErrProperty; -($ErrProperty, $ErrMessage) = $VM->Save(); +my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { FatalError "Can't set VM status to running: $ErrMessage\n",

1 0

Francois Gouget : testbot/build: Remove an unused variable in WineRunBuild. pl.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: d26f41afd04edda9c8a23a56217ab6922deadbb2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d26f41afd04edda9c8a23a56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:49:58 2013 +0100 testbot/build: Remove an unused variable in WineRunBuild.pl. --- testbot/bin/WineRunBuild.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 20a43da..728777a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -186,7 +186,6 @@ my $TA = $VM->GetAgent(); LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; -my $RptFileName = $VM->Name . ".rpt"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; my $FullRawlogFileName = "$TaskDir/rawlog";

1 0

Francois Gouget : testbot/TestAgent: Enable libssh2 compression.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: b64151902405857b6a193e60782872470c482e96 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b64151902405857b6a193e60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:51 2013 +0100 testbot/TestAgent: Enable libssh2 compression. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f3d5f0a..2b834f7 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -858,6 +858,11 @@ sub _Connect($) require Net::SSH2; $self->{ssh} = Net::SSH2->new(); $self->{ssh}->debug(1) if ($Debug > 1); + + # Set up compression + $self->{ssh}->method('COMP_CS', 'zlib', 'none'); + $self->{ssh}->method('COMP_SC', 'zlib', 'none'); + if (!$self->{ssh}->connect($self->{sshfd})) { $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror());

1 0

Francois Gouget : testbot/build: Clean up FatalError() and stop abusing it.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 4c9e159874c219053ce5e9ba1d3964912f8d0987 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c9e159874c219053ce5e9ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:01 2013 +0100 testbot/build: Clean up FatalError() and stop abusing it. If not given an error file and a task it's equivalent to a simple LogMsg() + exit(). --- testbot/bin/WineRunBuild.pl | 91 +++++++++++++++++++--------------------- testbot/bin/WineRunReconfig.pl | 85 ++++++++++++++++++------------------- testbot/bin/WineRunTask.pl | 90 ++++++++++++++++++--------------------- 3 files changed, 125 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=4c9e159874c219053ce5…

1 0

Francois Gouget : testbot: Document the user account management procedures.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: eb909209aa2686f6fd5ba093e39fbb11b9ce35d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb909209aa2686f6fd5ba093… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:38 2013 +0100 testbot: Document the user account management procedures. --- testbot/README | 25 +++++++++++++++++++++++++ testbot/doc/INSTALL.txt | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/testbot/README b/testbot/README index 4f4cbc9..f15f82a 100644 --- a/testbot/README +++ b/testbot/README @@ -68,3 +68,28 @@ WineTestBot: --------------- See the doc/INSTALL.txt file. + + +5. USER ACCOUNT MANAGEMENT +-------------------------- + +When a user asks for an account, a provisional account is created immediately +but has to be 'activated' before it can be used. Also an email is sent to the +WineTestBot administrators. + +If the request is considered to be illegitimate / spam, the administrator +should directly delete the provisional account. Otherwise the account should +be approved. + +Approving the account will generate a 'password reset code' and send an email +to the user with a URL to visit to set the account password. That will activate +the account and make it usable. + + +Notes: +* Existing accounts can be suspended by unchecking the 'active' field. This + prevents the user from logging in and changing the password. +* Only accounts that have the 'wine-devel' role can submit jobs. So + administrators who also want to submit jobs should add it to their account + (see the doc/INSTALL.txt file). +* FIXME: Document how the LDAP integration works. diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4c14668..a5655ec 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -58,6 +58,9 @@ General setup for the web site: the resetcode you just updated and a new password. - Make yourself admin by adding a row to UserRoles: mysql> insert into UserRoles values('<username>', 'admin'); +- If you want to be able to submit jobs from the same account you will likely + need to also give it the 'wine-devel' role: + mysql> insert into UserRoles values('<username>', wine-devel); - When you refresh the home page, you should now have an "Admin" menu in the sidebar.

1 0

Francois Gouget : testbot/TestAgent: Time the file transfers to provide speed statistics.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 0dede3eb003bb3682ec3ce22ba10fb8daa2880a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0dede3eb003bb3682ec3ce22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:45 2013 +0100 testbot/TestAgent: Time the file transfers to provide speed statistics. --- testbot/lib/WineTestBot/TestAgent.pm | 37 ++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 074e4f0..f3d5f0a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -53,6 +53,36 @@ sub debug(@) print STDERR @_ if ($Debug); } +my $time_hires; +sub now() +{ + local $@; + $time_hires=eval { require Time::HiRes } if (!defined $time_hires); + return eval { Time::HiRes::time() } if ($time_hires); + return time(); +} + +sub trace_speed($$) +{ + if ($Debug) + { + my ($Bytes, $Elapsed) = @_; + my $Speed = ""; + if ($Elapsed) + { + $Speed = $Bytes * 8 / $Elapsed / 1000; + $Speed = $Speed < 1000 ? sprintf(" (%.1fKb/s)", $Speed) : + sprintf(" (%.1fMb/s)", $Speed / 1000); + } + $Bytes = $Bytes < 8 * 1024 ? "$Bytes bytes" : + $Bytes < 8 * 1024 * 1024 ? sprintf("%.1fKiB", $Bytes / 1024) : + sprintf("%.1fMiB", $Bytes / 1024 / 1024); + $Elapsed = $Elapsed < 1 ? sprintf("%.1fms", $Elapsed * 1000) : + sprintf("%.1fs", $Elapsed); + debug("Transferred $Bytes in $Elapsed$Speed\n"); + } +} + sub new($$$;$) { my ($class, $Hostname, $Port, $Tunnel) = @_; @@ -396,6 +426,7 @@ sub _RecvFile($$$) my $Size = $self->_ExpectEntryHeader('d'); return undef if (!defined $Size); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -421,6 +452,7 @@ sub _RecvFile($$$) } $Size -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); + $Bytes += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); @@ -437,6 +469,8 @@ sub _RecvFile($$$) $@ = "timed out while receiving '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; } @@ -701,6 +735,7 @@ sub _SendFile($$$) return undef if (!defined $self->{fd}); debug(" SendFile($Filename)\n"); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -743,6 +778,8 @@ sub _SendFile($$$) $@ = "timed out while sending '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; }

1 0