February 2013 - Wine-Commits

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