February 2013 - Wine-Commits

Dmitry Timoshkov : gdiplus: Correct the GdipDrawString .spec entry.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 668cfb1c5ae75e0e1eed919117a2010f442f03af URL: http://source.winehq.org/git/wine.git/?a=commit;h=668cfb1c5ae75e0e1eed91911… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 21 13:31:44 2013 +0800 gdiplus: Correct the GdipDrawString .spec entry. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ccf47f9..920d78e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -187,7 +187,7 @@ 187 stdcall GdipDrawRectangleI(ptr ptr long long long long) 188 stdcall GdipDrawRectangles(ptr ptr ptr long) 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) -190 stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) +190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) 192 stdcall GdipEndContainer(ptr ptr) 193 stub GdipEnumerateMetafileDestPoint

1 0

Hans Leidekker : wmiutils: Add a stub implementation of IWbemPathKeyList.
by Alexandre Julliard Feb. 21, 2013

Feb. 21, 2013

Module: wine Branch: master Commit: 39a1b7050f532d37e3db2df25397f3944179ee9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a1b7050f532d37e3db2df25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:45:51 2013 +0100 wmiutils: Add a stub implementation of IWbemPathKeyList. --- dlls/wmiutils/path.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 221 insertions(+), 12 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 7b7e46f..5f64aa0 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -32,12 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); -struct key +struct keylist { - WCHAR *name; - int len_name; - WCHAR *value; - int len_value; + IWbemPathKeyList IWbemPathKeyList_iface; + IWbemPath *parent; + LONG refs; }; struct path @@ -59,6 +58,207 @@ struct path ULONGLONG flags; }; +static inline struct keylist *impl_from_IWbemPathKeyList( IWbemPathKeyList *iface ) +{ + return CONTAINING_RECORD(iface, struct keylist, IWbemPathKeyList_iface); +} + +static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) +{ + return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); +} + +static ULONG WINAPI keylist_AddRef( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + return InterlockedIncrement( &keylist->refs ); +} + +static ULONG WINAPI keylist_Release( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + LONG refs = InterlockedDecrement( &keylist->refs ); + if (!refs) + { + TRACE("destroying %p\n", keylist); + IWbemPath_Release( keylist->parent ); + heap_free( keylist ); + } + return refs; +} + +static HRESULT WINAPI keylist_QueryInterface( + IWbemPathKeyList *iface, + REFIID riid, + void **ppvObject ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + + TRACE("%p, %s, %p\n", keylist, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID( riid, &IID_IWbemPathKeyList ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemPathKeyList_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI keylist_GetCount( + IWbemPathKeyList *iface, + ULONG *puKeyCount ) +{ + FIXME("%p, %p\n", iface, puKeyCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + LPVOID pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey2( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + VARIANT *pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + ULONG *puKeyValBufSize, + LPVOID pKeyVal, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, puKeyValBufSize, pKeyVal, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey2( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + VARIANT *pKeyValue, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, pKeyValue, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags ) +{ + FIXME("%p, %s, 0x%x\n", iface, debugstr_w(wszName), uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveAllKeys( + IWbemPathKeyList *iface, + ULONG uFlags ) +{ + FIXME("%p, 0x%x\n", iface, uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_MakeSingleton( + IWbemPathKeyList *iface, + boolean bSet ) +{ + FIXME("%p, %d\n", iface, bSet); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetInfo( + IWbemPathKeyList *iface, + ULONG uRequestedInfo, + ULONGLONG *puResponse ) +{ + FIXME("%p, %u, %p\n", iface, uRequestedInfo, puResponse); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetText( + IWbemPathKeyList *iface, + LONG lFlags, + ULONG *puBuffLength, + LPWSTR pszText ) +{ + FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBuffLength, pszText); + return E_NOTIMPL; +} + +static const struct IWbemPathKeyListVtbl keylist_vtbl = +{ + keylist_QueryInterface, + keylist_AddRef, + keylist_Release, + keylist_GetCount, + keylist_SetKey, + keylist_SetKey2, + keylist_GetKey, + keylist_GetKey2, + keylist_RemoveKey, + keylist_RemoveAllKeys, + keylist_MakeSingleton, + keylist_GetInfo, + keylist_GetText +}; + +static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj ) +{ + struct keylist *keylist; + + TRACE("%p, %p\n", pUnkOuter, ppObj); + + if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY; + + keylist->IWbemPathKeyList_iface.lpVtbl = &keylist_vtbl; + keylist->refs = 1; + keylist->parent = parent; + IWbemPath_AddRef( keylist->parent ); + + *ppObj = &keylist->IWbemPathKeyList_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} + +struct key +{ + WCHAR *name; + int len_name; + WCHAR *value; + int len_value; +}; + static void init_path( struct path *path ) { path->text = NULL; @@ -93,11 +293,6 @@ static void clear_path( struct path *path ) init_path( path ); } -static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) -{ - return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); -} - static ULONG WINAPI path_AddRef( IWbemPath *iface ) { @@ -922,8 +1117,22 @@ static HRESULT WINAPI path_GetKeyList( IWbemPath *iface, IWbemPathKeyList **pOut) { - FIXME("%p, %p\n", iface, pOut); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + HRESULT hr; + + TRACE("%p, %p\n", iface, pOut); + + EnterCriticalSection( &path->cs ); + + if (!path->class) + { + LeaveCriticalSection( &path->cs ); + return WBEM_E_INVALID_PARAMETER; + } + hr = WbemPathKeyList_create( NULL, iface, (void **)pOut ); + + LeaveCriticalSection( &path->cs ); + return hr; } static HRESULT WINAPI path_CreateClassPart(

1 0

Nozomi Kodama : d3dx9: Avoid useless computations.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: de852879d1c9c3678307bb94ed2dda4b3a6d66fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de852879d1c9c3678307bb94e… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 23:04:25 2013 -1000 d3dx9: Avoid useless computations. --- dlls/d3dx9_36/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 10623f7..69c3297 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -388,10 +388,16 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, c D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2) { + D3DXMATRIX temp; + int i, j; + TRACE("pout %p, pm1 %p, pm2 %p\n", pout, pm1, pm2); - D3DXMatrixMultiply(pout, pm1, pm2); - D3DXMatrixTranspose(pout, pout); + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + temp.u.m[j][i] = pm1->u.m[i][0] * pm2->u.m[0][j] + pm1->u.m[i][1] * pm2->u.m[1][j] + pm1->u.m[i][2] * pm2->u.m[2][j] + pm1->u.m[i][3] * pm2->u.m[3][j]; + + *pout = temp; return pout; }

1 0

Nozomi Kodama : d3dx9: Specify arguments in trace to ease debugging.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: bd5921814003a162edd20f811e48629614974f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5921814003a162edd20f811… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:43:29 2013 -1000 d3dx9: Specify arguments in trace to ease debugging. --- dlls/d3dx9_36/math.c | 174 +++++++++++++++++++++++++------------------------ 1 files changed, 89 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd5921814003a162edd20…

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC to trace a path.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 42a5943598eb908686e27554c2882617b6445bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a5943598eb908686e27554c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:18:56 2013 +0800 gdiplus: Use an off-screen DC to trace a path. --- dlls/gdiplus/region.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f7bad57..5583514 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -894,7 +894,7 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) if (!graphics) { - new_hdc = GetDC(0); + new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; @@ -902,13 +902,13 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) graphics = new_graphics; if (stat != Ok) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); return stat; } } else if (!graphics->hdc) { - graphics->hdc = new_hdc = GetDC(0); + graphics->hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; } @@ -929,7 +929,7 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) RestoreDC(graphics->hdc, save_state); if (new_hdc) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); if (new_graphics) GdipDeleteGraphics(new_graphics); else

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC as an image surface.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 0553eba08f15a321838f34e7aac15ead64c2cb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0553eba08f15a321838f34e7a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:18:13 2013 +0800 gdiplus: Use an off-screen DC as an image surface. --- dlls/gdiplus/image.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9c34333..59ea41c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -116,10 +116,9 @@ static INT ipicture_pixel_height(IPicture *pic) IPicture_get_Height(pic, &y); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); y = MulDiv(y, GetDeviceCaps(hdcref, LOGPIXELSY), INCH_HIMETRIC); - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return y; } @@ -131,11 +130,9 @@ static INT ipicture_pixel_width(IPicture *pic) IPicture_get_Width(pic, &x); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); x = MulDiv(x, GetDeviceCaps(hdcref, LOGPIXELSX), INCH_HIMETRIC); - - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return x; } @@ -1688,7 +1685,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biClrUsed = 0; bih.biClrImportant = 0; - screendc = GetDC(0); + screendc = CreateCompatibleDC(0); if (iinfo.hbmColor) { GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); @@ -1756,7 +1753,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) } } - ReleaseDC(0, screendc); + DeleteDC(screendc); DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); @@ -1806,14 +1803,14 @@ static void generate_halftone_palette(ARGB *entries, UINT count) static GpStatus get_screen_resolution(REAL *xres, REAL *yres) { - HDC screendc = GetDC(0); + HDC screendc = CreateCompatibleDC(0); if (!screendc) return GenericError; *xres = (REAL)GetDeviceCaps(screendc, LOGPIXELSX); *yres = (REAL)GetDeviceCaps(screendc, LOGPIXELSY); - ReleaseDC(0, screendc); + DeleteDC(screendc); return Ok; }

1 0

Piotr Caban : msvcrt: Mark gmtime32 tests with negative argument as broken on win8.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 61f82d6d02eb34333de9c45561e47f68fb6f1d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f82d6d02eb34333de9c4556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 20 15:53:24 2013 +0100 msvcrt: Mark gmtime32 tests with negative argument as broken on win8. --- dlls/msvcrt/tests/time.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index b9bc7f1..30d9fa7 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -109,7 +109,7 @@ static void test_gmtime(void) gmt = -1; gmt_tm = p_gmtime32(&gmt); - ok(gmt_tm == NULL, "gmt_tm != NULL\n"); + ok(gmt_tm==NULL || broken(gmt_tm->tm_year==70 && gmt_tm->tm_sec<0), "gmt_tm != NULL\n"); gmt = valid = 0; gmt_tm = p_gmtime32(&gmt); @@ -181,9 +181,12 @@ static void test_gmtime(void) errno = 0; gmt = -1; err = p_gmtime32_s(&gmt_tm_s, &gmt); - ok(err == EINVAL, "err = %d\n", err); - ok(errno == EINVAL, "errno = %d\n", errno); - ok(gmt_tm_s.tm_year == -1, "tm_year = %d\n", gmt_tm_s.tm_year); + ok(gmt_tm_s.tm_year==-1 || broken(gmt_tm_s.tm_year==70 && gmt_tm->tm_sec<0), + "tm_year = %d\n", gmt_tm_s.tm_year); + if(gmt_tm_s.tm_year == -1) { + ok(err==EINVAL, "err = %d\n", err); + ok(errno==EINVAL, "errno = %d\n", errno); + } } static void test_mktime(void)

1 0

Jacek Caban : urlmon: Added a few more forward to propsys.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: fa5075f7de7358aaebac915cd7981a47a6a12361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5075f7de7358aaebac915cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:17:40 2013 +0100 urlmon: Added a few more forward to propsys. --- dlls/urlmon/urlmon.spec | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 069421f..e66fff7 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -96,11 +96,14 @@ @ stub ZonesReInit 111 stdcall @(wstr) IsProtectedModeURL +328 stdcall @(ptr ptr) propsys.VariantCompare 329 stdcall @(ptr ptr) propsys.VariantToGUID 331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer 350 stdcall @(ptr ptr) propsys.PropVariantToGUID 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString +363 stdcall @(long long ptr) propsys.InitVariantFromResource +387 stdcall @(ptr long) propsys.VariantToUInt32WithDefault 410 stdcall @(long long) LogSqmBits 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState

1 0

Jacek Caban : winhttp: Get cert store directly from cert in netconn_verify_cert.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 3fd046b460d5ee784899c0fe4177975e923652c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd046b460d5ee784899c0fe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 11:14:18 2013 +0100 winhttp: Get cert store directly from cert in netconn_verify_cert. --- dlls/winhttp/net.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a51e919..d2fdb86 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -139,9 +139,9 @@ static int sock_get_error( int err ) return err; } -static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server, DWORD security_flags ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { + HCERTSTORE store = cert->hCertStore; BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; PCCERT_CHAIN_CONTEXT chain; @@ -468,7 +468,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, cert->hCertStore, hostname, conn->security_flags); + res = netconn_verify_cert(cert, hostname, conn->security_flags); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res);

1 0

Alexandre Julliard : psapi/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: ab2eb34a823e1c9af39dd1c26e218e140ec5b3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2eb34a823e1c9af39dd1c26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 20 13:17:12 2013 +0100 psapi/tests: Define the required Windows version before including anything. --- dlls/psapi/tests/psapi_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 130c33e..b91add6 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - /* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ #define _WIN32_WINNT 0x0500 +#include <stdarg.h> + #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Michael Stefaniuc : ddraw/tests: Simplify some equality comparisons between bools.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 54a1504c57c032274e0e2f134751570513edd9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a1504c57c032274e0e2f134… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:11:36 2013 +0100 ddraw/tests: Simplify some equality comparisons between bools. --- dlls/ddraw/tests/dsurface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 4e08224..eb39801 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4724,7 +4724,7 @@ static void partial_block_lock_test(void) { SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4736,7 +4736,7 @@ static void partial_block_lock_test(void) SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4751,7 +4751,7 @@ static void partial_block_lock_test(void) { SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4763,7 +4763,7 @@ static void partial_block_lock_test(void) SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);

1 0

Jacek Caban : mshtml: Added IHTMLDocument5::createAttribute tests.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 5ffeb458d864ef50b2778145c5f04edef277dc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffeb458d864ef50b2778145c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:38 2013 +0100 mshtml: Added IHTMLDocument5::createAttribute tests. --- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5ee0261..2013b53 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2609,6 +2609,18 @@ static void test_dynamic_properties(IHTMLElement *elem) SysFreeString(attr1); } +#define test_attr_node_name(a,b) _test_attr_node_name(__LINE__,a,b) +static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const char *exname) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLDOMAttribute_get_nodeName(attr, &str); + ok_(__FILE__,line)(hres == S_OK, "get_nodeName failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exname), "node name is %s, expected %s\n", wine_dbgstr_w(str), exname); + SysFreeString(str); +} + static void test_attr_collection_disp(IDispatch *disp) { IDispatchEx *dispex; @@ -2647,10 +2659,9 @@ static void test_attr_collection_disp(IDispatch *disp) ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLDOMAttribute, (void**)&attr); ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); - hres = IHTMLDOMAttribute_get_nodeName(attr, &bstr); - ok(hres == S_OK, "get_nodeName failed: %08x\n", hres); - ok(!strcmp_wa(bstr, "attr1"), "node name is %s, expected attr1\n", wine_dbgstr_w(bstr)); - SysFreeString(bstr); + + test_attr_node_name(attr, "attr1"); + IHTMLDOMAttribute_Release(attr); VariantClear(&var); @@ -6399,6 +6410,7 @@ static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; IHTMLDOMNode *node, *node2, *node3, *comment; + IHTMLDOMAttribute *attr; IHTMLDocument5 *doc5; IDispatch *disp; VARIANT var; @@ -6490,6 +6502,20 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(comment); } + str = a2bstr("Test"); + hres = IHTMLDocument5_createAttribute(doc5, str, &attr); + ok(hres == S_OK, "createAttribute dailed: %08x\n", hres); + SysFreeString(str); + if(SUCCEEDED(hres)) { + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); + test_ifaces((IUnknown*)attr, attr_iids); + test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + + test_attr_node_name(attr, "Test"); + + IHTMLDOMAttribute_Release(attr); + } + IHTMLDocument5_Release(doc5); }

1 0

Jacek Caban : mshtml: Added support for IHTMLDOMAttribute:: get_nodeName in detached attributes.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 06666c266d4ae59d62deea1cbaed0f8db3b760bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=06666c266d4ae59d62deea1cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:27 2013 +0100 mshtml: Added support for IHTMLDOMAttribute::get_nodeName in detached attributes. --- dlls/mshtml/htmlattr.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 4c4d8a4..1b01662 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -126,8 +126,13 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS TRACE("(%p)->(%p)\n", This, p); if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; + if(!This->name) { + FIXME("No name available\n"); + return E_FAIL; + } + + *p = SysAllocString(This->name); + return *p ? S_OK : E_OUTOFMEMORY; } return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p);

1 0

Andrew Talbot : msvcrt: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: d8efcc9cb341e0ad7df2dad63a2a422d1dc42e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8efcc9cb341e0ad7df2dad63… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 19 22:24:42 2013 +0000 msvcrt: Avoid signed-unsigned integer comparisons. --- dlls/msvcrt/file.c | 9 +++++---- dlls/msvcrt/locale.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fc4154c..612f470 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -363,7 +363,7 @@ static int msvcrt_alloc_fd(HANDLE hand, int flag) /* caller must hold the files lock */ static MSVCRT_FILE* msvcrt_alloc_fp(void) { - unsigned int i; + int i; MSVCRT_FILE *file; for (i = 3; i < MSVCRT_max_streams; i++) @@ -1047,7 +1047,8 @@ int CDECL MSVCRT__fcloseall(void) /* free everything on process exit */ void msvcrt_free_io(void) { - int i; + unsigned int i; + int j; MSVCRT__fcloseall(); /* The Win32 _fcloseall() function explicitly doesn't close stdin, @@ -1061,9 +1062,9 @@ void msvcrt_free_io(void) for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) MSVCRT_free(MSVCRT___pioinfo[i]); - for(i=0; i<MSVCRT_stream_idx; i++) + for(j=0; j<MSVCRT_stream_idx; j++) { - MSVCRT_FILE *file = msvcrt_get_file(i); + MSVCRT_FILE *file = msvcrt_get_file(j); if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) { ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4540e9a..7fa4882 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -492,7 +492,7 @@ char* CDECL _Getmonths(void) void* CDECL _Gettnames(void) { MSVCRT___lc_time_data *ret, *cur = get_locinfo()->lc_time_curr; - int i, size = sizeof(MSVCRT___lc_time_data); + unsigned int i, size = sizeof(MSVCRT___lc_time_data); TRACE("\n");

1 0

Andrew Talbot : msxml3: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 5360780a9b412def4cbf17f64cebff042549aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5360780a9b412def4cbf17f64… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 19 22:24:44 2013 +0000 msxml3: Avoid signed-unsigned integer comparisons. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/factory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 49e6168..7a3543f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3245,7 +3245,7 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * ConnectionPoint *This = impl_from_IConnectionPoint(iface); IUnknown *sink; HRESULT hr; - int i; + DWORD i; TRACE("(%p)->(%p %p)\n", This, unk_sink, cookie); diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 1ad3a1e..d308c12 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -98,7 +98,7 @@ static const struct clsid_version_t clsid_versions_table[] = static MSXML_VERSION get_msxml_version(const GUID *clsid) { - int i; + unsigned int i; for (i = 0; i < sizeof(clsid_versions_table)/sizeof(struct clsid_version_t); i++) if (IsEqualGUID(clsid, clsid_versions_table[i].clsid))

1 0

Francois Gouget : ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 3e6d0a373d38b84efe26506348005346838fd702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d0a373d38b84efe2650634… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 20 00:14:40 2013 +0100 ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver. --- dlls/ddraw/tests/ddrawmodes.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 82fae5b..68deea4a 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -473,7 +473,10 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - U2(ddsd).dwRefreshRate = 1; + /* Ask for a refresh rate that could not possibly be used. But note that + * the Windows 'Standard VGA' driver claims to run the display at 1Hz! + */ + U2(ddsd).dwRefreshRate = 2; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc);

1 0

Nozomi Kodama : d3dx9: Add a missing trace.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: f9347a8f0ea4c356d8cbed7b2c2e3f35f57d87c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9347a8f0ea4c356d8cbed7b2… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:52:42 2013 -1000 d3dx9: Add a missing trace. --- dlls/d3dx9_36/math.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 0afb36b..10623f7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1743,6 +1743,9 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2* out, UINT outstride D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { const D3DXVECTOR2 v = *pv; + + TRACE("pout %p, pv %p, pm %p", pout, pv, pm); + pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y; pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y; return pout;

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC for font enumeration.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 97b92fe12c35673a9234f990b8f66797cc58c603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b92fe12c35673a9234f990b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:17:36 2013 +0800 gdiplus: Use an off-screen DC for font enumeration. --- dlls/gdiplus/font.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6e31331..51c7aec 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -979,12 +979,12 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, *IsStyleAvailable = FALSE; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); if(!EnumFontFamiliesW(hdc, family->FamilyName, font_has_style_proc, (LPARAM)style)) *IsStyleAvailable = TRUE; - ReleaseDC(0, hdc); + DeleteDC(hdc); return Ok; } @@ -1276,7 +1276,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); @@ -1288,7 +1288,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } return Ok; } @@ -1403,7 +1403,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lfw.lfFaceName[0] = 0; @@ -1416,7 +1416,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } *fontCollection = &installedFontCollection;

1 0

Jacek Caban : mshtml: Addeed IHTMLDocument5::createAttribute implementation .
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: a9136b56f7b65ebe94d64e7ec0c1e9cbb73f0203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9136b56f7b65ebe94d64e7ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:15 2013 +0100 mshtml: Addeed IHTMLDocument5::createAttribute implementation. --- dlls/mshtml/htmlattr.c | 48 ++++++++++++++++++++++++++++------------- dlls/mshtml/htmldoc5.c | 13 +++++++++- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 6 +++- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 5d4c2b4..4c4d8a4 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -81,6 +81,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) if(!ref) { assert(!This->elem); release_dispex(&This->dispex); + heap_free(This->name); heap_free(This); } @@ -124,6 +125,11 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS TRACE("(%p)->(%p)\n", This, p); + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p); } @@ -163,16 +169,16 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { - *p = VARIANT_TRUE; - return S_OK; - } - if(!This->elem || !This->elem->nselem) { FIXME("NULL This->elem\n"); return E_UNEXPECTED; } + if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { + *p = VARIANT_TRUE; + return S_OK; + } + hres = IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, &name); if(FAILED(hres)) return hres; @@ -221,7 +227,7 @@ static dispex_static_data_t HTMLDOMAttribute_dispex = { HTMLDOMAttribute_iface_tids }; -HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) +HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) { HTMLAttributeCollection *col; HTMLDOMAttribute *ret; @@ -231,23 +237,35 @@ HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribu if(!ret) return E_OUTOFMEMORY; - hres = HTMLElement_get_attr_col(&elem->node, &col); - if(FAILED(hres)) { - heap_free(ret); - return hres; - } - IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); - ret->IHTMLDOMAttribute_iface.lpVtbl = &HTMLDOMAttributeVtbl; ret->ref = 1; - ret->dispid = dispid; ret->elem = elem; - list_add_tail(&elem->attrs->attrs, &ret->entry); init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, &HTMLDOMAttribute_dispex); + /* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */ + if(elem) { + hres = HTMLElement_get_attr_col(&elem->node, &col); + if(FAILED(hres)) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return hres; + } + IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); + + list_add_tail(&elem->attrs->attrs, &ret->entry); + } + + /* For detached attributes we may still do most operations if we have its name available. */ + if(name) { + ret->name = heap_strdupW(name); + if(!ret->name) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return E_OUTOFMEMORY; + } + } + *attr = ret; return S_OK; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index edf8109..8871934 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -120,8 +120,17 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR IHTMLDOMAttribute **ppattribute) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); + + hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, &attr); + if(FAILED(hres)) + return hres; + + *ppattribute = &attr->IHTMLDOMAttribute_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bstrdata, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6867a17..8239973 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2246,7 +2246,7 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - hres = HTMLDOMAttribute_Create(This->elem, id, attr); + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, attr); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 75200c4..38aaa24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -852,12 +852,14 @@ typedef struct { LONG ref; - DISPID dispid; + WCHAR *name; + HTMLElement *elem; + DISPID dispid; struct list entry; } HTMLDOMAttribute; -HRESULT HTMLDOMAttribute_Create(HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; +HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onfocus property implementation.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 2a0fd1c95606c7fa0c2a619d130543a83d4477cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0fd1c95606c7fa0c2a619d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:59 2013 +0100 mshtml: Added IHTMLWindow2::onfocus property implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9e3cb72..2a2b5ca 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -949,15 +949,19 @@ static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_FOCUS, &v); } static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_FOCUS, p); } static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Forward IHTMLDocument3:: get_childNodes to IHTMLDOMNode implemnentation.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: c2cfc4cf8b25a2ac3f155725ffffdbcf806282cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cfc4cf8b25a2ac3f155725f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:51 2013 +0100 mshtml: Forward IHTMLDocument3::get_childNodes to IHTMLDOMNode implemnentation. --- dlls/mshtml/htmldoc3.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index e1efa7a..4b9b12e 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -496,8 +496,10 @@ static HRESULT WINAPI HTMLDocument3_get_baseUrl(IHTMLDocument3 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument3_get_childNodes(IHTMLDocument3 *iface, IDispatch **p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDOMNode_get_childNodes(&This->doc_node->node.IHTMLDOMNode_iface, p); } static HRESULT WINAPI HTMLDocument3_put_inheritStyleSheets(IHTMLDocument3 *iface,

1 0

Huw Davies : usp10: Clusters are represented by glyph indices not character positions.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 5e5d8d215b60c83d3919711c17a73fa719b6bb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5d8d215b60c83d3919711c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 20 09:51:10 2013 +0000 usp10: Clusters are represented by glyph indices not character positions. --- dlls/usp10/usp10.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8bfe156..5287556 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2534,8 +2534,9 @@ HRESULT WINAPI ScriptCPtoX(int iCP, if (check >= cChars && !iMaxPos) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, 1); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, 1); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2666,8 +2667,9 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (check >= cChars && direction > 0) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, direction); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, direction); iSpecial = item; special_size /= (cChars - item); iPosX += special_size;

1 0

Michael Stefaniuc : shell32: COM clean up for the inner IUnknown of ShellFSFolder.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: df56b233e0ce02c9b48fe5f8f7c80ad5b19c5a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df56b233e0ce02c9b48fe5f8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:13:49 2013 +0100 shell32: COM clean up for the inner IUnknown of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 89 +++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 8439da1..1ccd2ef 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -59,14 +59,13 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - const IUnknownVtbl *lpVtbl; - LONG ref; + IUnknown IUnknown_inner; + LONG ref; const IShellFolder2Vtbl *lpvtblShellFolder; const IPersistFolder3Vtbl *lpvtblPersistFolder3; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; - - IUnknown *pUnkOuter; /* used for aggregation */ + IUnknown *outer_unk; CLSID *pclsid; @@ -79,12 +78,16 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IUnknownVtbl unkvt; static const IShellFolder2Vtbl sfvt; static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; +static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); +} + static inline IGenericSFImpl *impl_from_IShellFolder2( IShellFolder2 *iface ) { return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblShellFolder)); @@ -109,7 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) #define _IShellFolder_(This) ((IShellFolder*)&(This)->lpvtblShellFolder) #define _IShellFolder2_(This) ((IShellFolder2*)&(This)->lpvtblShellFolder) #define _IPersist_(This) (&(This)->lpvtblPersistFolder3) @@ -132,19 +134,18 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This) } /************************************************************************** -* we need a separate IUnknown to handle aggregation -* (inner IUnknown) +* inner IUnknown */ -static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, void **ppvObj) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; + IGenericSFImpl *This = impl_from_IUnknown(iface); - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; if (IsEqualIID (riid, &IID_IUnknown)) - *ppvObj = _IUnknown_ (This); + *ppvObj = &This->IUnknown_inner; else if (IsEqualIID (riid, &IID_IShellFolder)) *ppvObj = _IShellFolder_ (This); else if (IsEqualIID (riid, &IID_IShellFolder2)) @@ -165,7 +166,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, } if (*ppvObj) { - IUnknown_AddRef ((IUnknown *) (*ppvObj)); + IUnknown_AddRef((IUnknown *)*ppvObj); TRACE ("-- Interface = %p\n", *ppvObj); return S_OK; } @@ -173,31 +174,31 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) +static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%d\n", This, ref); - return refCount; + return ref; } -static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) +static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%d\n", This, ref); - if (!refCount) { - TRACE ("-- destroying IShellFolder(%p)\n", This); + if (!ref) { + TRACE("-- destroying IShellFolder(%p)\n", This); - SHFree (This->pidlRoot); - SHFree (This->sPathTarget); - LocalFree (This); + SHFree(This->pidlRoot); + SHFree(This->sPathTarget); + LocalFree(This); } - return refCount; + return ref; } static const IUnknownVtbl unkvt = @@ -239,16 +240,16 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) return E_OUTOFMEMORY; sf->ref = 0; - sf->lpVtbl = &unkvt; + sf->IUnknown_inner.lpVtbl = &unkvt; sf->lpvtblShellFolder = &sfvt; sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); + sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { - IUnknown_Release (_IUnknown_ (sf)); + if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { + IUnknown_Release(&sf->IUnknown_inner); return E_NOINTERFACE; } @@ -271,7 +272,7 @@ IShellFolder_fnQueryInterface (IShellFolder2 * iface, REFIID riid, TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } /************************************************************************** @@ -284,7 +285,7 @@ static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************** @@ -296,7 +297,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************** @@ -1136,7 +1137,7 @@ ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) @@ -1145,7 +1146,7 @@ static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) @@ -1154,7 +1155,7 @@ static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /**************************************************************************** @@ -1450,7 +1451,7 @@ IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); } /************************************************************************ @@ -1464,7 +1465,7 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************ @@ -1478,7 +1479,7 @@ IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************ @@ -1673,7 +1674,7 @@ ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) @@ -1682,7 +1683,7 @@ static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) @@ -1691,7 +1692,7 @@ static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI

1 0

André Hentschel : kernel32: Add stub for GetCurrentPackageId.
by Alexandre Julliard Feb. 20, 2013

Feb. 20, 2013

Module: wine Branch: master Commit: 2976b6342fdcf1f4c1e9a4dd38bf14083f5c8ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2976b6342fdcf1f4c1e9a4dd3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 19 23:19:34 2013 +0100 kernel32: Add stub for GetCurrentPackageId. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 6 +++ include/winerror.h | 78 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f2f039b..93bfb77 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -498,6 +498,7 @@ @ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) +@ stdcall GetCurrentPackageId(ptr ptr) @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 9f21435..b9d13e4 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -201,3 +201,9 @@ BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD return RtlGetProductInfo(dwOSMajorVersion, dwOSMinorVersion, dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); } + +LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) +{ + FIXME("(%p %p): stub\n", len, buffer); + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/include/winerror.h b/include/winerror.h index b6281f8..edd8af0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1934,6 +1934,84 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_RESOURCE_ENUM_USER_STOP 15106 #define ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED 15107 #define ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME 15108 +#define ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE 15110 +#define ERROR_MRM_INVALID_PRICONFIG 15111 +#define ERROR_MRM_INVALID_FILE_TYPE 15112 +#define ERROR_MRM_UNKNOWN_QUALIFIER 15113 +#define ERROR_MRM_INVALID_QUALIFIER_VALUE 15114 +#define ERROR_MRM_NO_CANDIDATE 15115 +#define ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE 15116 +#define ERROR_MRM_RESOURCE_TYPE_MISMATCH 15117 +#define ERROR_MRM_DUPLICATE_MAP_NAME 15118 +#define ERROR_MRM_DUPLICATE_ENTRY 15119 +#define ERROR_MRM_INVALID_RESOURCE_IDENTIFIER 15120 +#define ERROR_MRM_FILEPATH_TOO_LONG 15121 +#define ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE 15122 +#define ERROR_MRM_INVALID_PRI_FILE 15126 +#define ERROR_MRM_NAMED_RESOURCE_NOT_FOUND 15127 +#define ERROR_MRM_MAP_NOT_FOUND 15135 +#define ERROR_MRM_UNSUPPORTED_PROFILE_TYPE 15136 +#define ERROR_MRM_INVALID_QUALIFIER_OPERATOR 15137 +#define ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE 15138 +#define ERROR_MRM_AUTOMERGE_ENABLED 15139 +#define ERROR_MRM_TOO_MANY_RESOURCES 15140 +#define ERROR_MCA_INVALID_CAPABILITIES_STRING 15200 +#define ERROR_MCA_INVALID_VCP_VERSION 15201 +#define ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION 15202 +#define ERROR_MCA_MCCS_VERSION_MISMATCH 15203 +#define ERROR_MCA_UNSUPPORTED_MCCS_VERSION 15204 +#define ERROR_MCA_INTERNAL_ERROR 15205 +#define ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED 15206 +#define ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE 15207 +#define ERROR_AMBIGUOUS_SYSTEM_DEVICE 15250 +#define ERROR_SYSTEM_DEVICE_NOT_FOUND 15299 +#define ERROR_HASH_NOT_SUPPORTED 15300 +#define ERROR_HASH_NOT_PRESENT 15301 +#define ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED 15321 +#define ERROR_GPIO_CLIENT_INFORMATION_INVALID 15322 +#define ERROR_GPIO_VERSION_NOT_SUPPORTED 15323 +#define ERROR_GPIO_INVALID_REGISTRATION_PACKET 15324 +#define ERROR_GPIO_OPERATION_DENIED 15325 +#define ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE 15326 +#define ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED 15327 +#define ERROR_CANNOT_SWITCH_RUNLEVEL 15400 +#define ERROR_INVALID_RUNLEVEL_SETTING 15401 +#define ERROR_RUNLEVEL_SWITCH_TIMEOUT 15402 +#define ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT 15403 +#define ERROR_RUNLEVEL_SWITCH_IN_PROGRESS 15404 +#define ERROR_SERVICES_FAILED_AUTOSTART 15405 +#define ERROR_COM_TASK_STOP_PENDING 15501 +#define ERROR_INSTALL_OPEN_PACKAGE_FAILED 15600 +#define ERROR_INSTALL_PACKAGE_NOT_FOUND 15601 +#define ERROR_INSTALL_INVALID_PACKAGE 15602 +#define ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED 15603 +#define ERROR_INSTALL_OUT_OF_DISK_SPACE 15604 +#define ERROR_INSTALL_NETWORK_FAILURE 15605 +#define ERROR_INSTALL_REGISTRATION_FAILURE 15606 +#define ERROR_INSTALL_DEREGISTRATION_FAILURE 15607 +#define ERROR_INSTALL_CANCEL 15608 +#define ERROR_INSTALL_FAILED 15609 +#define ERROR_REMOVE_FAILED 15610 +#define ERROR_PACKAGE_ALREADY_EXISTS 15611 +#define ERROR_NEEDS_REMEDIATION 15612 +#define ERROR_INSTALL_PREREQUISITE_FAILED 15613 +#define ERROR_PACKAGE_REPOSITORY_CORRUPTED 15614 +#define ERROR_INSTALL_POLICY_FAILURE 15615 +#define ERROR_PACKAGE_UPDATING 15616 +#define ERROR_DEPLOYMENT_BLOCKED_BY_POLICY 15617 +#define ERROR_PACKAGES_IN_USE 15618 +#define ERROR_RECOVERY_FILE_CORRUPT 15619 +#define ERROR_INVALID_STAGED_SIGNATURE 15620 +#define ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED 15621 +#define ERROR_INSTALL_PACKAGE_DOWNGRADE 15622 +#define ERROR_SYSTEM_NEEDS_REMEDIATION 15623 +#define ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN 15624 +#define ERROR_RESILIENCY_FILE_CORRUPT 15625 +#define ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING 15626 +#define APPMODEL_ERROR_NO_PACKAGE 15700 +#define APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT 15701 +#define APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT 15702 +#define APPMODEL_ERROR_NO_APPLICATION 15703 /* HRESULT values for OLE, SHELL and other Interface stuff */ /* the codes 4000-40ff are reserved for OLE */

1 0

Lucas Zawacki : Portuguese translation for release 1.5.24
by Jeremy Newman Feb. 20, 2013

Feb. 20, 2013

Module: website Branch: master Commit: 75bffd54131db74adb0ee7380c6c95a6f9fea6c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=75bffd54131db74adb0ee7… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 19 13:50:05 2013 -0300 Portuguese translation for release 1.5.24 --- news/pt/2013021501.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013021501.xml b/news/pt/2013021501.xml new file mode 100644 index 0000000..884e9ed --- /dev/null +++ b/news/pt/2013021501.xml @@ -0,0 +1,14 @@ +<news> +<date>15 de Fevereiro de 2013</date> +<title>Wine 1.5.24 lançado</title> +<body> + A versão de desenvolvimento 1.5.24 já está disponível agora. + <a href="{$root}/announce/1.5.24">Novidades</a> desta versão: +<ul> + <li>Suporte a teclado e rodinha do mouse no driver de Mac.</li> + <li>Suporte a expressões regulares em VB Script.</li> + <li>Diversas limpezas no código do RichEdit.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0