November 2009 - Wine-commits

Hans Leidekker : include: Add protocol sequence constants.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: bdfaa8463b69d2b257483497c253e3459908946c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfaa8463b69d2b257483497c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:22:01 2009 +0100 include: Add protocol sequence constants. --- include/rpcdce.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index 5b714b5..de30561 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -108,6 +108,11 @@ typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234 #define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10 +#define RPC_PROTSEQ_TCP 0x1 +#define RPC_PROTSEQ_NMP 0x2 +#define RPC_PROTSEQ_LRPC 0x3 +#define RPC_PROTSEQ_HTTP 0x4 + /* RPC_POLICY EndpointFlags */ #define RPC_C_BIND_TO_ALL_NICS 0x1 #define RPC_C_USE_INTERNET_PORT 0x1

1 0

Hans Leidekker : rpcrt4: Implement RpcBindingInqAuthClient{, Ex}.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 59e3d9b5c7a070a64d2507c372b9a41552659c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e3d9b5c7a070a64d2507c37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:22:53 2009 +0100 rpcrt4: Implement RpcBindingInqAuthClient{, Ex}. --- dlls/rpcrt4/rpc_binding.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 8 ++-- include/rpcdce.h | 22 ++++++++++++ 3 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 29e0709..622918d 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1493,6 +1493,90 @@ RpcBindingInqAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR *ServerPrincName, U } /*********************************************************************** + * RpcBindingInqAuthClientA (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ) +{ + return RpcBindingInqAuthClientExA(ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, 0); +} + +/*********************************************************************** + * RpcBindingInqAuthClientW (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ) +{ + return RpcBindingInqAuthClientExW(ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, 0); +} + +/*********************************************************************** + * RpcBindingInqAuthClientExA (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientExA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ) +{ + RPC_STATUS status; + RPC_WSTR principal; + + TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, Flags); + + status = RpcBindingInqAuthClientExW(ClientBinding, Privs, ServerPrincName ? &principal : NULL, + AuthnLevel, AuthnSvc, AuthzSvc, Flags); + if (status == RPC_S_OK && ServerPrincName) + { + *ServerPrincName = (RPC_CSTR)RPCRT4_strdupWtoA(principal); + RpcStringFreeW(&principal); + if (!*ServerPrincName) return ERROR_OUTOFMEMORY; + } + + return status; +} + +/*********************************************************************** + * RpcBindingInqAuthClientExW (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ) +{ + RpcBinding *bind = ClientBinding; + + TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, Flags); + + if (!bind->AuthInfo) return RPC_S_BINDING_HAS_NO_AUTH; + + if (Privs) *Privs = (RPC_AUTHZ_HANDLE)bind->AuthInfo->identity; + if (ServerPrincName) + { + *ServerPrincName = RPCRT4_strdupW(bind->AuthInfo->server_principal_name); + if (!*ServerPrincName) return ERROR_OUTOFMEMORY; + } + if (AuthnLevel) *AuthnLevel = bind->AuthInfo->AuthnLevel; + if (AuthnSvc) *AuthnSvc = bind->AuthInfo->AuthnSvc; + if (AuthzSvc) + { + FIXME("authorization service not implemented\n"); + *AuthzSvc = RPC_C_AUTHZ_NONE; + } + if (Flags) + FIXME("flags 0x%x not implemented\n", Flags); + + return RPC_S_OK; +} + +/*********************************************************************** * RpcBindingSetAuthInfoExA (RPCRT4.@) */ RPCRTAPI RPC_STATUS RPC_ENTRY diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0a04769..6ce9401 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -341,10 +341,10 @@ @ stdcall RpcBindingFree(ptr) @ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr) -@ stub RpcBindingInqAuthClientA -@ stub RpcBindingInqAuthClientExA -@ stub RpcBindingInqAuthClientExW -@ stub RpcBindingInqAuthClientW +@ stdcall RpcBindingInqAuthClientA(ptr ptr ptr ptr ptr ptr) +@ stdcall RpcBindingInqAuthClientExA(ptr ptr ptr ptr ptr ptr long) +@ stdcall RpcBindingInqAuthClientExW(ptr ptr ptr ptr ptr ptr long) +@ stdcall RpcBindingInqAuthClientW(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqAuthInfoA(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqAuthInfoExA(ptr ptr ptr ptr ptr ptr long ptr) @ stdcall RpcBindingInqAuthInfoExW(ptr ptr ptr ptr ptr ptr long ptr) diff --git a/include/rpcdce.h b/include/rpcdce.h index de30561..dc2c8de 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -509,6 +509,28 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc ); #define RpcBindingInqAuthInfo WINELIB_NAME_AW(RpcBindingInqAuthInfo) +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ); + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc ); +#define RpcBindingInqAuthClient WINELIB_NAME_AW(RpcBindingInqAuthClient) + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientExA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ); + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs, + RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, + ULONG *AuthzSvc, ULONG Flags ); +#define RpcBindingInqAuthClientEx WINELIB_NAME_AW(RpcBindingInqAuthClientEx) + RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void*,LONG);

1 0

Vladimir Pankratov : jscript: Update Russian translation.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 456835f360a1f2bec8a27693c1f042a1699f2085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456835f360a1f2bec8a27693c… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Nov 11 16:19:29 2009 +0500 jscript: Update Russian translation. --- dlls/jscript/jscript_Ru.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Ru.rc b/dlls/jscript/jscript_Ru.rc index 95745bd..9632d3f 100644 --- a/dlls/jscript/jscript_Ru.rc +++ b/dlls/jscript/jscript_Ru.rc @@ -44,6 +44,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Ожидается объект типа 'bool'" IDS_JSCRIPT_EXPECTED "Ожидается объект типа 'JScript'" IDS_REGEXP_SYNTAX_ERROR "Синтаксическая ошибка в регулярном выражении" + IDS_URI_INVALID_CHAR "URI содержит неверные символы" IDS_INVALID_LENGTH "Длиной массива должно быть конечное положительное число" IDS_ARRAY_EXPECTED "Ожидается объект типа 'Array'" }

1 0

Huw Davies : include: Add asynot.idl.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: cf8c3eca416a00aaf22ec7cd85267ef88c480050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8c3eca416a00aaf22ec7cd8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 11 10:48:44 2009 +0000 include: Add asynot.idl. --- dlls/msdaps/usrmarshal.c | 44 ++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/asynot.idl | 59 ++++++++++++++++++++++++++++++++++++++++++++++ include/dbs.idl | 17 +++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 6 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 2337b5e..6a436a3 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -773,3 +773,47 @@ HRESULT __RPC_STUB ICommandText_SetCommandText_Stub(ICommandText* This, REFGUID return hr; } + +HRESULT CALLBACK IDBAsynchNotify_OnLowResource_Proxy(IDBAsynchNotify* This, DB_DWRESERVE dwReserved) +{ + FIXME("(%p)->(%08x): stub\n", This, dwReserved); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchNotify_OnLowResource_Stub(IDBAsynchNotify* This, DB_DWRESERVE dwReserved) +{ + FIXME("(%p)->(%08x): stub\n", This, dwReserved); + return E_NOTIMPL; +} + +HRESULT CALLBACK IDBAsynchNotify_OnProgress_Proxy(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, + LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %d, %d, %d, %s): stub\n", This, hChapter, eOperation, ulProgress, ulProgressMax, + eAsynchPhase, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchNotify_OnProgress_Stub(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, + LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %d, %d, %d, %s): stub\n", This, hChapter, eOperation, ulProgress, ulProgressMax, + eAsynchPhase, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} + +HRESULT CALLBACK IDBAsynchNotify_OnStop_Proxy(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + HRESULT hrStatus, LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchNotify_OnStop_Stub(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + HRESULT hrStatus, LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 2a49856..e34d393 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -105,6 +105,7 @@ SRCDIR_INCLUDES = \ advpub.h \ af_irda.h \ appmgmt.h \ + asynot.idl \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/include/asynot.idl b/include/asynot.idl new file mode 100644 index 0000000..2f52713 --- /dev/null +++ b/include/asynot.idl @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a96-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBAsynchNotify : IUnknown +{ + [local] + HRESULT OnLowResource([in] DB_DWRESERVE dwReserved); + + [call_as(OnLowResource)] + HRESULT RemoteOnLowResource([in] DB_DWRESERVE dwReserved); + + [local] + HRESULT OnProgress([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] DBCOUNTITEM ulProgress, + [in] DBCOUNTITEM ulProgressMax, + [in] DBASYNCHPHASE eAsynchPhase, + [in, annotation("__in_opt")] LPOLESTR pwszStatusText); + + [call_as(OnProgress)] + HRESULT RemoteOnProgress([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] DBCOUNTITEM ulProgress, + [in] DBCOUNTITEM ulProgressMax, + [in] DBASYNCHPHASE eAsynchPhase, + [in, unique, string] LPOLESTR pwszStatusText); + + [local] + HRESULT OnStop([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] HRESULT hrStatus, + [in, annotation("__in_opt")] LPOLESTR pwszStatusText); + + [call_as(OnStop)] + HRESULT RemoteOnStop([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] HRESULT hrStatus, + [in, unique, string] LPOLESTR pwszStatusText); +} diff --git a/include/dbs.idl b/include/dbs.idl index dd12628..8b3bb0d 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -287,6 +287,23 @@ typedef struct tagDBPARAMS HACCESSOR hAccessor; } DBPARAMS; +typedef DWORD DBASYNCHOP; + +enum DBASYNCHOPENUM +{ + DBSYNCHOP_OPEN, +}; + +typedef DWORD DBASYNCHPHASE; + +enum DBASYNCHPHASEENUM +{ + DBASYNCHPHASE_INITIALIZATION, + DBASYNCHPHASE_POPULATION, + DBASYNCHPHASE_COMPLETE, + DBASYNCHPHASE_CANCELED, +}; + typedef struct tagRMTPACK { ISequentialStream *pISeqStream; diff --git a/include/oledb.idl b/include/oledb.idl index b525b56..b9f0654 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -54,6 +54,7 @@ typedef DWORD DBHASHVALUE; #include "dbprop.idl" #include "dbinit.idl" #include "dbdsad.idl" +#include "asynot.idl" #include "sesprp.idl" #include "opnrst.idl" #include "row.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 828e6b0..1ef571b 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -110,6 +110,7 @@ my %exported_wine_headers = ( my %private_idl_headers = ( "access.idl" => 1, + "asynot.idl" => 1, "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1,

1 0

Alexandre Julliard : gdi32: Don' t update the metafile bounding box in ExtTextOut if there's no rectangle.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 872feb47c4dbcf342e7017800535ccd5f9beba44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872feb47c4dbcf342e7017800… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 13:07:10 2009 +0100 gdi32: Don't update the metafile bounding box in ExtTextOut if there's no rectangle. --- dlls/gdi32/enhmfdrv/graphics.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index f0630d2..9c9cf6b 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -826,11 +826,10 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, pemr->rclBounds.bottom = y + textHeight + 1; } } + EMFDRV_UpdateBBox( dev, &pemr->rclBounds ); no_bounds: ret = EMFDRV_WriteRecord( dev, &pemr->emr ); - if(ret) - EMFDRV_UpdateBBox( dev, &pemr->rclBounds ); HeapFree( GetProcessHeap(), 0, pemr ); return ret; }

1 0

Peter Urbanec : winex11: Implement AlphaBlend mode for the case where SourceConstantAlpha is combined with source alpha .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: ab081aa84535e013b89a6c4c3a8a9fcee636840d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab081aa84535e013b89a6c4c3… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Wed Nov 11 02:58:41 2009 +1100 winex11: Implement AlphaBlend mode for the case where SourceConstantAlpha is combined with source alpha. --- dlls/winex11.drv/xrender.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 005296b..2eb1d1e 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1956,9 +1956,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid return FALSE; } - if ((blendfn.AlphaFormat & AC_SRC_ALPHA) && blendfn.SourceConstantAlpha != 0xff) - FIXME("Ignoring SourceConstantAlpha %d for AC_SRC_ALPHA\n", blendfn.SourceConstantAlpha); - if(dib.dsBm.bmBitsPixel != 32) { FIXME("not a 32 bpp dibsection\n"); return FALSE; @@ -1979,11 +1976,35 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid if (blendfn.AlphaFormat & AC_SRC_ALPHA) { - for(; y >= y2; y--) + if (blendfn.SourceConstantAlpha == 0xff) { - memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, - widthSrc * 4); - dstbits += (top_down ? -1 : 1) * widthSrc; + for (; y >= y2; y--) + { + memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, + widthSrc * 4); + dstbits += (top_down ? -1 : 1) * widthSrc; + } + } + else + { + /* SourceConstantAlpha combined with source alpha */ + for (; y >= y2; y--) + { + int x; + DWORD *srcbits = (DWORD *)((char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes) + xSrc; + for (x = 0; x < widthSrc; x++) + { + DWORD argb = *srcbits++; + BYTE *s = (BYTE *) &argb; + s[0] = (s[0] * blendfn.SourceConstantAlpha) / 255; + s[1] = (s[1] * blendfn.SourceConstantAlpha) / 255; + s[2] = (s[2] * blendfn.SourceConstantAlpha) / 255; + s[3] = (s[3] * blendfn.SourceConstantAlpha) / 255; + *dstbits++ = argb; + } + if (top_down) /* we traversed the row forward so we should go back by two rows */ + dstbits -= 2 * widthSrc; + } } } else

1 0

Viliam Lejcik : kernel32: Fix GetCurrencyFormat grouping.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 3dc8b28d841a8f676b158bccbfe33ef1200e6e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc8b28d841a8f676b158bccb… Author: Viliam Lejcik <lejcik(a)host.sk> Date: Mon Nov 9 10:41:54 2009 +0100 kernel32: Fix GetCurrencyFormat grouping. --- dlls/kernel32/lcformat.c | 2 +- dlls/kernel32/tests/locale.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 1b1dfcc..f1b5ba5 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1521,7 +1521,7 @@ GetCurrencyFormatW_Error: dwState |= NF_DIGITS_OUT; dwCurrentGroupCount++; - if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount) + if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount && *szSrc != '-') { LPWSTR lpszGrp = lpFormat->lpThousandSep + strlenW(lpFormat->lpThousandSep) - 1; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 77fae8b..37dc0aa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -743,6 +743,18 @@ static void test_GetCurrencyFormatA(void) ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENA; EXPECT_EQA; + STRINGSA("235","$235.0"); /* Grouping of a positive number */ + format.Grouping = 3; + ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; + + STRINGSA("-235","$-235.0"); /* Grouping of a negative number */ + format.NegativeOrder = 2; + ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; + format.LeadingZero = 1; /* Always provide leading zero */ STRINGSA(".5","$0.5"); ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, COUNTOF(buffer)); @@ -990,6 +1002,18 @@ static void test_GetNumberFormatA(void) ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENA; EXPECT_EQA; + STRINGSA("235","235.0"); /* Grouping of a positive number */ + format.Grouping = 3; + ret = GetNumberFormatA(lcid, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; + + STRINGSA("-235","-235.0"); /* Grouping of a negative number */ + format.NegativeOrder = NEG_LEFT; + ret = GetNumberFormatA(lcid, 0, input, &format, buffer, COUNTOF(buffer)); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; + format.LeadingZero = 1; /* Always provide leading zero */ STRINGSA(".5","0.5"); ret = GetNumberFormatA(lcid, 0, input, &format, buffer, COUNTOF(buffer));

1 0

Ilya Shpigor : extrac32: Implementation of the CAB archive extraction.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 007586ea29859a2698a0c05ffe81045f9d94fbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=007586ea29859a2698a0c05ff… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Mon Nov 9 14:04:08 2009 +0300 extrac32: Implementation of the CAB archive extraction. --- programs/extrac32/Makefile.in | 2 +- programs/extrac32/extrac32.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index 31aa7e0..78e4fef 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = extrac32.exe APPMODE = -mwindows -municode EXTRADEFS = -DWINE_NO_UNICODE -IMPORTS = shell32 user32 kernel32 +IMPORTS = shell32 setupapi user32 kernel32 C_SRCS = \ extrac32.c diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index e6fefc9..7e66458 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -21,12 +21,39 @@ #include <windows.h> #include <shellapi.h> +#include <setupapi.h> #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(extrac32); +static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) +{ + FILE_IN_CABINET_INFO_W *pInfo; + FILEPATHS_W *pFilePaths; + + switch(Notification) + { + case SPFILENOTIFY_FILEINCABINET: + pInfo = (FILE_IN_CABINET_INFO_W*)Param1; + lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); + lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); + return FILEOP_DOIT; + case SPFILENOTIFY_FILEEXTRACTED: + pFilePaths = (FILEPATHS_W*)Param1; + WINE_TRACE("Extracted %s\n", wine_dbgstr_w(pFilePaths->Target)); + return NO_ERROR; + } + return NO_ERROR; +} + +static void extract(LPCWSTR cabfile, LPWSTR destdir) +{ + if (!SetupIterateCabinetW(cabfile, 0, ExtCabCallback, destdir)) + WINE_ERR("Could not extract cab file %s\n", wine_dbgstr_w(cabfile)); +} + int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) { LPWSTR *argv; @@ -105,7 +132,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho break; case 'E': /* Extract CAB archive */ - WINE_FIXME("/E not implemented\n"); + extract(cabfile, path); break; case 0: case 'D':

1 0

Paul Vriens : shell32/tests: Run tests again on NT4.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 8d5e5e74a1531ca13af0e64269e496ee6dbaad09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5e5e74a1531ca13af0e6426… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 11 09:09:29 2009 +0100 shell32/tests: Run tests again on NT4. --- dlls/shell32/tests/progman_dde.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 36ce835..e4867e1 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -59,6 +59,16 @@ #define DDE_TEST_NUMMASK 0x0000ffff +static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); + +static void init_function_pointers(void) +{ + HMODULE hmod; + + hmod = GetModuleHandleA("shell32.dll"); + pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); +} + static HDDEDATA CALLBACK DdeCallback(UINT type, UINT format, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hDDEData, ULONG_PTR data1, ULONG_PTR data2) { @@ -233,6 +243,9 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx DWORD attributes; int len; + if (!pSHGetSpecialFolderPathA) + return; + path = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); if (path != NULL) { @@ -243,13 +256,13 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx if (testParams & DDE_TEST_COMMON) { specialFolder = CSIDL_COMMON_PROGRAMS; - err = SHGetSpecialFolderPath(NULL, path, specialFolder, FALSE); + err = pSHGetSpecialFolderPathA(NULL, path, specialFolder, FALSE); /* Win 9x fails, use CSIDL_PROGRAMS (err == FALSE) */ } if (err == FALSE) { specialFolder = CSIDL_PROGRAMS; - err = SHGetSpecialFolderPath(NULL, path, specialFolder, FALSE); + err = pSHGetSpecialFolderPathA(NULL, path, specialFolder, FALSE); } len = strlen(path) + strlen(nameToCheck)+1; if (groupName != NULL) @@ -526,6 +539,12 @@ START_TEST(progman_dde) HCONV hConv; int testnum; + init_function_pointers(); + + /* Only report this once */ + if (!pSHGetSpecialFolderPathA) + win_skip("SHGetSpecialFolderPathA is not available\n"); + /* Initialize DDE Instance */ err = DdeInitialize(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err));

1 0

Jörg Höhle : winmm/tests: Give flaky progress test more time.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: db921ef7dcff3fef7e07f2184a47928c00abd2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=db921ef7dcff3fef7e07f2184… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Nov 8 22:50:41 2009 +0100 winmm/tests: Give flaky progress test more time. --- dlls/winmm/tests/mci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 05da6cd..5ce8cd4 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -405,8 +405,8 @@ static void test_asyncWAVE(HWND hwnd) ok(strcmp(buf,"2000"), "mci status position: %s\n", buf); trace("position after Sleep: %sms\n",buf); p2 = atoi(buf); - /* MS-Windows' 15.625ms timer may return after 93ms? */ - ok(p2>=(WORD)(((WORD)(100/15.625))*15.625),"not enough time elapsed %ums\n",p2); + /* Some machines reach 79ms only during the 100ms sleep. */ + ok(p2>=67,"not enough time elapsed %ums\n",p2); test_notification(hwnd,"play (nowait)",0); err = mciSendString("pause mysound wait", NULL, 0, hwnd);

1 0