July 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Add support for bin.hex element type encoding.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: a9aee4c03fbd0862cb0c1e481331bc6b9de7c158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9aee4c03fbd0862cb0c1e481… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 2 09:43:27 2012 +0400 msxml3: Add support for bin.hex element type encoding. --- dlls/msxml3/element.c | 50 ++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 61 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 105 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index db6b283..eee737e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -801,6 +801,23 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) return S_OK; } +static HRESULT encode_binhex(const BYTE *buf, int len, BSTR *ret) +{ + static const char byte_to_hex[16] = "0123456789abcdef"; + int i; + + *ret = SysAllocStringLen(NULL, len*2); + if (!*ret) return E_OUTOFMEMORY; + + for (i = 0; i < len; i++) + { + (*ret)[2*i] = byte_to_hex[buf[i] >> 4]; + (*ret)[2*i+1] = byte_to_hex[0x0f & buf[i]]; + } + + return S_OK; +} + static HRESULT WINAPI domelem_put_nodeTypedValue( IXMLDOMElement *iface, VARIANT value) @@ -865,6 +882,39 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( return E_NOTIMPL; } break; + case DT_BIN_HEX: + if (V_VT(&value) == (VT_UI1|VT_ARRAY)) + { + UINT dim = SafeArrayGetDim(V_ARRAY(&value)); + LONG lbound, ubound; + BSTR encoded; + BYTE *ptr; + int len; + + if (dim > 1) + FIXME("unexpected array dimension count %u\n", dim); + + SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound); + SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound); + + len = (ubound - lbound + 1)*SafeArrayGetElemsize(V_ARRAY(&value)); + + hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr); + if (FAILED(hr)) return hr; + + hr = encode_binhex(ptr, len, &encoded); + SafeArrayUnaccessData(V_ARRAY(&value)); + if (FAILED(hr)) return hr; + + hr = node_set_content(&This->node, encoded); + SysFreeString(encoded); + } + else + { + FIXME("unhandled variant type %d for dt:%s\n", V_VT(&value), debugstr_dt(dt)); + return E_NOTIMPL; + } + break; default: FIXME("not implemented for dt:%s\n", debugstr_dt(dt)); return E_NOTIMPL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5dc2581..4b68e74 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9165,6 +9165,8 @@ static void test_createProcessingInstruction(void) static void test_put_nodeTypedValue(void) { + static const BYTE binhexdata[16] = + {0,1,2,3,4,5,6,7,8,9,0xa,0xb,0xc,0xd,0xe,0xf}; IXMLDOMDocument *doc; IXMLDOMElement *elem; VARIANT type, value; @@ -9179,28 +9181,28 @@ static void test_put_nodeTypedValue(void) if (!doc) return; hr = IXMLDOMDocument_createElement(doc, _bstr_("Element"), &elem); - ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_OK); V_VT(&type) = VT_EMPTY; hr = IXMLDOMElement_get_dataType(elem, &type); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type)); /* set typed value for untyped node */ V_VT(&type) = VT_I1; V_I1(&type) = 1; hr = IXMLDOMElement_put_nodeTypedValue(elem, type); - ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_OK); V_VT(&type) = VT_EMPTY; hr = IXMLDOMElement_get_dataType(elem, &type); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type)); /* no type info stored */ V_VT(&type) = VT_EMPTY; hr = IXMLDOMElement_get_nodeTypedValue(elem, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_HR(hr, S_OK); ok(V_VT(&type) == VT_BSTR, "got %d, expected VT_BSTR\n", V_VT(&type)); ok(memcmp(V_BSTR(&type), _bstr_("1"), 2*sizeof(WCHAR)) == 0, "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); @@ -9257,7 +9259,7 @@ static void test_put_nodeTypedValue(void) hr = SafeArrayAccessData(array, (void*)&ptr); EXPECT_HR(hr, S_OK); memcpy(ptr, "dGVzdA=", strlen("dGVzdA=")); - SafeArrayUnaccessData(V_ARRAY(&value)); + SafeArrayUnaccessData(array); V_VT(&value) = VT_UI1|VT_ARRAY; V_ARRAY(&value) = array; @@ -9290,7 +9292,54 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); + SafeArrayDestroyData(array); + /* bin.hex */ + V_VT(&value) = VT_BSTR; + V_BSTR(&value) = _bstr_(""); + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_put_dataType(elem, _bstr_("bin.hex")); + EXPECT_HR(hr, S_OK); + + array = SafeArrayCreateVector(VT_UI1, 0, 16); + hr = SafeArrayAccessData(array, (void*)&ptr); + EXPECT_HR(hr, S_OK); + memcpy(ptr, binhexdata, sizeof(binhexdata)); + SafeArrayUnaccessData(array); + + V_VT(&value) = VT_UI1|VT_ARRAY; + V_ARRAY(&value) = array; + hr = IXMLDOMElement_put_nodeTypedValue(elem, value); + EXPECT_HR(hr, S_OK); + + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); + EXPECT_HR(hr, S_OK); + ok(V_VT(&value) == (VT_UI1|VT_ARRAY), "got %d\n", V_VT(&value)); + ok(SafeArrayGetDim(V_ARRAY(&value)) == 1, "got wrong dimension\n"); + ubound = 0; + hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound); + EXPECT_HR(hr, S_OK); + ok(ubound == 15, "got %d\n", ubound); + lbound = 0; + hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound); + EXPECT_HR(hr, S_OK); + ok(lbound == 0, "got %d\n", lbound); + hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr); + EXPECT_HR(hr, S_OK); + ok(!memcmp(ptr, binhexdata, sizeof(binhexdata)), "got wrong data\n"); + SafeArrayUnaccessData(V_ARRAY(&value)); + VariantClear(&value); + + /* if set with VT_UI1|VT_ARRAY it's encoded */ + hr = IXMLDOMElement_get_firstChild(elem, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str)); + IXMLDOMNode_Release(node); SafeArrayDestroyData(array); IXMLDOMElement_Release(elem);

1 0

Vincas Miliūnas : wined3d: Recognize AMD Radeon HD 6700 Series renderer string.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: ada3dff134a1d711deafc495da2d73cb4387749e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada3dff134a1d711deafc495d… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Mon Jul 2 16:36:34 2012 +0300 wined3d: Recognize AMD Radeon HD 6700 Series renderer string. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 381eae7..b0c2d38 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1151,6 +1151,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6700, "AMD Radeon HD 6700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ @@ -1713,6 +1714,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 6800", CARD_AMD_RADEON_HD6800}, {"HD 6770M",CARD_AMD_RADEON_HD6600M}, {"HD 6750M",CARD_AMD_RADEON_HD6600M}, + {"HD 6700", CARD_AMD_RADEON_HD6700}, {"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600", CARD_AMD_RADEON_HD6600}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d07091..a5b2c55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1341,6 +1341,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600M = 0x6741, + CARD_AMD_RADEON_HD6700 = 0x68BA, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Hans Leidekker : wbemprox: Support overriding the CIM to VARIANT type mapping for integer properties.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: cd340ac87f1c785bfab9c29df11bd051cff59496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd340ac87f1c785bfab9c29df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 2 16:00:50 2012 +0200 wbemprox: Support overriding the CIM to VARIANT type mapping for integer properties. --- dlls/wbemprox/query.c | 59 +++++++++++++++++++++++++++++--------- dlls/wbemprox/wbemprox_private.h | 1 + 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f54fcc3..2a7c088 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -662,11 +662,43 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC return WBEM_E_NOT_FOUND; } +static void set_variant( VARTYPE vartype, LONGLONG val, BSTR val_bstr, VARIANT *ret ) +{ + switch (vartype) + { + case VT_BSTR: + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = val_bstr; + return; + case VT_I2: + V_VT( ret ) = VT_I2; + V_I2( ret ) = val; + return; + case VT_UI2: + V_VT( ret ) = VT_UI2; + V_UI2( ret ) = val; + return; + case VT_I4: + V_VT( ret ) = VT_I4; + V_I4( ret ) = val; + return; + case VT_UI4: + V_VT( ret ) = VT_UI4; + V_UI4( ret ) = val; + return; + default: + ERR("unhandled variant type %u\n", vartype); + return; + } +} + HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type, LONG *flavor ) { HRESULT hr; UINT column, row = view->result[index]; + VARTYPE vartype; + BSTR val_bstr = NULL; LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); @@ -675,6 +707,8 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR hr = get_column_index( view->table, name, &column ); if (hr != S_OK) return WBEM_E_NOT_FOUND; + vartype = view->table->columns[column].vartype; + hr = get_value( view->table, row, column, &val ); if (hr != S_OK) return hr; @@ -682,37 +716,34 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR { case CIM_STRING: case CIM_DATETIME: - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = SysAllocString( (const WCHAR *)(INT_PTR)val ); + vartype = VT_BSTR; + val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val ); break; case CIM_SINT16: - V_VT( ret ) = VT_I2; - V_I2( ret ) = val; + if (!vartype) vartype = VT_I2; break; case CIM_UINT16: - V_VT( ret ) = VT_UI2; - V_UI2( ret ) = val; + if (!vartype) vartype = VT_UI2; break; case CIM_SINT32: - V_VT( ret ) = VT_I4; - V_I4( ret ) = val; + if (!vartype) vartype = VT_I4; break; case CIM_UINT32: - V_VT( ret ) = VT_UI4; - V_UI4( ret ) = val; + if (!vartype) vartype = VT_UI4; break; case CIM_SINT64: - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = get_value_bstr( view->table, row, column ); + vartype = VT_BSTR; + val_bstr = get_value_bstr( view->table, row, column ); break; case CIM_UINT64: - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = get_value_bstr( view->table, row, column ); + vartype = VT_BSTR; + val_bstr = get_value_bstr( view->table, row, column ); break; default: ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED; } + set_variant( vartype, val, val_bstr, ret ); if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; if (flavor) *flavor = 0; return S_OK; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 437da28..602fbaa 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -31,6 +31,7 @@ struct column { const WCHAR *name; UINT type; + VARTYPE vartype; /* 0 for default mapping */ }; struct table

1 0

Hans Leidekker : wbemprox: Fix the CIM to VARIANT type mapping for a couple of properties.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 8fc1c948c7caebb48c5bb78347ee45f719382b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc1c948c7caebb48c5bb7834… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 2 16:01:17 2012 +0200 wbemprox: Fix the CIM to VARIANT type mapping for a couple of properties. --- dlls/wbemprox/builtin.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b564f19..75f37dc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -136,14 +136,14 @@ static const struct column col_compsys[] = { prop_descriptionW, CIM_STRING }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, - { prop_numlogicalprocessorsW, CIM_UINT32 }, - { prop_numprocessorsW, CIM_UINT32 }, + { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, + { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; static const struct column col_logicaldisk[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_drivetypeW, CIM_UINT32 }, + { prop_drivetypeW, CIM_UINT32, VT_I4 }, { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_freespaceW, CIM_UINT64 }, { prop_sizeW, CIM_UINT64 } @@ -151,8 +151,8 @@ static const struct column col_logicaldisk[] = static const struct column col_networkadapter[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_interfaceindexW, CIM_UINT32 }, - { prop_netconnectionstatusW, CIM_UINT16 }, + { prop_interfaceindexW, CIM_UINT32, VT_I4 }, + { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_speedW, CIM_UINT64 } }; static const struct column col_os[] = @@ -160,7 +160,7 @@ static const struct column col_os[] = { prop_captionW, CIM_STRING }, { prop_csdversionW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING }, - { prop_oslanguageW, CIM_UINT32 }, + { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING } }; static const struct column col_process[] = @@ -169,9 +169,9 @@ static const struct column col_process[] = { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_pprocessidW, CIM_UINT32 }, - { prop_processidW, CIM_UINT32 }, - { prop_threadcountW, CIM_UINT32 } + { prop_pprocessidW, CIM_UINT32, VT_I4 }, + { prop_processidW, CIM_UINT32, VT_I4 }, + { prop_threadcountW, CIM_UINT32, VT_I4 } }; static const struct column col_processor[] = {

1 0

Jacek Caban : wininet: Try harder to reuse connection after authorization.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: c40011702770b748ad565c654a1b9abee4124135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40011702770b748ad565c654… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 2 17:15:04 2012 +0200 wininet: Try harder to reuse connection after authorization. --- dlls/wininet/http.c | 70 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1788bf2..7f82cb8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -219,6 +219,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWOR static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); static BOOL HTTP_VerifyValidHeader(http_request_t *req, LPCWSTR field); +static BOOL drain_content(http_request_t*,BOOL); static CRITICAL_SECTION connection_pool_cs; static CRITICAL_SECTION_DEBUG connection_pool_debug = @@ -1906,22 +1907,6 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } -static void drain_content(http_request_t *req) -{ - BOOL try_reuse; - - if (!req->netconn) return; - - if (req->contentLength == -1) - try_reuse = FALSE; - else if(!strcmpW(req->verb, szHEAD)) - try_reuse = TRUE; - else - try_reuse = req->data_stream->vtbl->drain_content(req->data_stream, req); - - http_release_netconn(req, try_reuse); -} - static BOOL HTTP_KeepAlive(http_request_t *request) { WCHAR szVersion[10]; @@ -1951,7 +1936,7 @@ static void HTTPREQ_CloseConnection(object_header_t *hdr) { http_request_t *req = (http_request_t*)hdr; - drain_content(req); + http_release_netconn(req, drain_content(req, FALSE)); } static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) @@ -2757,6 +2742,39 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * return res; } +static BOOL drain_content(http_request_t *req, BOOL blocking) +{ + BOOL ret; + + if(!req->netconn || req->contentLength == -1) + return FALSE; + + if(!strcmpW(req->verb, szHEAD)) + return TRUE; + + if(!blocking) + return req->data_stream->vtbl->drain_content(req->data_stream, req); + + EnterCriticalSection( &req->read_section ); + + while(1) { + DWORD bytes_read, res; + BYTE buf[4096]; + + res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); + if(res != ERROR_SUCCESS) { + ret = FALSE; + break; + } + if(!bytes_read) { + ret = TRUE; + break; + } + } + + LeaveCriticalSection( &req->read_section ); + return ret; +} static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) { @@ -4769,10 +4787,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, char *ascii_req; loop_next = FALSE; + reusing_connection = request->netconn != NULL; - /* like native, just in case the caller forgot to call InternetReadFile - * for all the data */ - drain_content(request); if(redirected) { request->contentLength = ~0u; request->bytesToWrite = 0; @@ -4807,7 +4823,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, TRACE("Request header -> %s\n", debugstr_w(requestString) ); - if ((res = open_http_connection(request, &reusing_connection)) != ERROR_SUCCESS) + if (!reusing_connection && (res = open_http_connection(request, &reusing_connection)) != ERROR_SUCCESS) break; /* send the request as ASCII, tack on the optional data */ @@ -4895,7 +4911,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, heap_free(request->verb); request->verb = heap_strdupW(szGET); } - drain_content(request); + http_release_netconn(request, drain_content(request, FALSE)); if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) { INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, @@ -4928,6 +4944,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, Host->lpszValue)) { heap_free(requestString); + if(!drain_content(request, TRUE)) { + FIXME("Could not drain content\n"); + http_release_netconn(request, FALSE); + } loop_next = TRUE; break; } @@ -4950,6 +4970,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->appInfo->proxyPassword, NULL)) { + if(!drain_content(request, TRUE)) { + FIXME("Could not drain content\n"); + http_release_netconn(request, FALSE); + } loop_next = TRUE; break; } @@ -5064,7 +5088,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ heap_free(request->verb); request->verb = heap_strdupW(szGET); } - drain_content(request); + http_release_netconn(request, drain_content(request, FALSE)); if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) { INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT,

1 0

Piotr Caban : msvcp90: Fix __cdecl functions definitions that returns structures.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 8a15e426b3495b24a3ff30943017efef9c388c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a15e426b3495b24a3ff30943… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 2 18:31:50 2012 +0200 msvcp90: Fix __cdecl functions definitions that returns structures. --- dlls/msvcp100/msvcp100.spec | 6 ++-- dlls/msvcp60/msvcp60.spec | 6 ++-- dlls/msvcp70/msvcp70.spec | 6 ++-- dlls/msvcp71/msvcp71.spec | 6 ++-- dlls/msvcp80/msvcp80.spec | 6 ++-- dlls/msvcp90/locale.c | 46 ++++++++++++++++++++++++------------------ dlls/msvcp90/msvcp90.spec | 6 ++-- dlls/msvcp90/string.c | 20 +++++++----------- 8 files changed, 52 insertions(+), 50 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index fcfe427..523ca2f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2808,9 +2808,9 @@ @ extern _FSnan msvcp90._FSnan # extern _FXbig @ stub _GetLocaleForCP -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ stub _Getdateorder @ cdecl _Getwctype(long ptr) msvcp90._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp90._Getwctypes diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 3c9e2ed..7af0c29 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4274,9 +4274,9 @@ @ stub _FSinh @ extern _FSnan msvcp90._FSnan # extern _FXbig -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ extern _Hugeval msvcp90._Hugeval @ extern _Inf msvcp90._Inf @ stub _LCosh diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index efdced6..0964d83 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5061,9 +5061,9 @@ @ extern _FSnan msvcp90._FSnan # extern _FXbig # extern _FZero -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ extern _Hugeval msvcp90._Hugeval @ extern _Inf msvcp90._Inf @ stub _LCosh diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index a38e1c4..671950b 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5115,9 +5115,9 @@ @ extern _FSnan msvcp90._FSnan # extern _FXbig # extern _FZero -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ cdecl _Getwctype(long ptr) msvcp90._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp90._Getwctypes @ extern _Hugeval msvcp90._Hugeval diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 2209c60..61a21ff 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5724,9 +5724,9 @@ @ stub _FSinh @ extern _FSnan msvcp90._FSnan # extern _FXbig -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ stub _Getdateorder @ cdecl _Getwctype(long ptr) msvcp90._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp90._Getwctypes diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6fbe349..c8d4aca 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -542,17 +542,20 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char } /* _Getcoll */ -_Collvec __cdecl _Getcoll(void) +ULONGLONG __cdecl _Getcoll(void) { - _Collvec ret; + union { + _Collvec collvec; + ULONGLONG ull; + } ret; _locale_t locale = _get_current_locale(); TRACE("\n"); - ret.page = locale->locinfo->lc_collate_cp; - ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret.collvec.page = locale->locinfo->lc_collate_cp; + ret.collvec.handle = locale->locinfo->lc_handle[LC_COLLATE]; _free_locale(locale); - return ret; + return ret.ull; } /* ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ */ @@ -560,29 +563,29 @@ _Collvec __cdecl _Getcoll(void) DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 8) _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) { - *ret = _Getcoll(); + ULONGLONG ull = _Getcoll(); + memcpy(ret, &ull, sizeof(ull)); return ret; } /* _Getctype */ -_Ctypevec __cdecl _Getctype(void) +_Ctypevec* __cdecl _Getctype(_Ctypevec *ret) { - _Ctypevec ret; _locale_t locale = _get_current_locale(); short *table; TRACE("\n"); - ret.page = locale->locinfo->lc_codepage; - ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; - ret.delfl = TRUE; + ret->page = locale->locinfo->lc_codepage; + ret->handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret->delfl = TRUE; table = malloc(sizeof(short[256])); if(!table) { _free_locale(locale); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } memcpy(table, locale->locinfo->pctype, sizeof(short[256])); - ret.table = table; + ret->table = table; _free_locale(locale); return ret; } @@ -592,22 +595,24 @@ _Ctypevec __cdecl _Getctype(void) DEFINE_THISCALL_WRAPPER(_Locinfo__Getctype, 8) _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) { - *ret = _Getctype(); - return ret; + return _Getctype(ret); } /* _Getcvt */ -_Cvtvec __cdecl _Getcvt(void) +ULONGLONG __cdecl _Getcvt(void) { - _Cvtvec ret; _locale_t locale = _get_current_locale(); + union { + _Cvtvec cvtvec; + ULONGLONG ull; + } ret; TRACE("\n"); - ret.page = locale->locinfo->lc_codepage; - ret.handle = locale->locinfo->lc_handle[LC_CTYPE]; + ret.cvtvec.page = locale->locinfo->lc_codepage; + ret.cvtvec.handle = locale->locinfo->lc_handle[LC_CTYPE]; _free_locale(locale); - return ret; + return ret.ull; } /* ?_Getcvt(a)_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ @@ -615,7 +620,8 @@ _Cvtvec __cdecl _Getcvt(void) DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8) _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) { - *ret = _Getcvt(); + ULONGLONG ull = _Getcvt(); + memcpy(ret, &ull, sizeof(ull)); return ret; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c0eff7f..35fe11d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5750,9 +5750,9 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl _Getcoll() -@ cdecl _Getctype() -@ cdecl _Getcvt() +@ cdecl -ret64 _Getcoll() +@ cdecl _Getctype(ptr) +@ cdecl -ret64 _Getcvt() @ stub _Getdateorder @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 163fce0..f4811cd 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -3218,15 +3218,13 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate(basic_string_wc /* ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)AEBV10@_W(a)Z */ /* ??$?HGU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA?AV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)ABV10@G(a)Z */ /* ??$?HGU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA?AV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)AEBV10@G(a)Z */ -basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch( - const basic_string_wchar *left, wchar_t right) +basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch( + basic_string_wchar *ret, const basic_string_wchar *left, wchar_t right) { - basic_string_wchar ret = { 0 }; - TRACE("%p %c\n", left, right); - MSVCP_basic_string_wchar_copy_ctor(&ret, left); - MSVCP_basic_string_wchar_append_ch(&ret, right); + MSVCP_basic_string_wchar_copy_ctor(ret, left); + MSVCP_basic_string_wchar_append_ch(ret, right); return ret; } @@ -3234,15 +3232,13 @@ basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch( /* ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_WAEBV10@@Z */ /* ??$?HGU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA?AV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)GABV10@@Z */ /* ??$?HGU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA?AV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)GAEBV10@@Z */ -basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_ch_bstr( - wchar_t left, const basic_string_wchar *right) +basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_ch_bstr( + basic_string_wchar* ret, wchar_t left, const basic_string_wchar *right) { - basic_string_wchar ret = { 0 }; - TRACE("%c %p\n", left, right); - MSVCP_basic_string_wchar_ctor_cstr_len(&ret, &left, 1); - MSVCP_basic_string_wchar_append(&ret, right); + MSVCP_basic_string_wchar_ctor_cstr_len(ret, &left, 1); + MSVCP_basic_string_wchar_append(ret, right); return ret; }

1 0

Piotr Caban : msvcp90/tests: Fixed _Getctype tests.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: e16922f3f3282fa3f093c98656690bf985dec04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16922f3f3282fa3f093c9865… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 2 18:32:05 2012 +0200 msvcp90/tests: Fixed _Getctype tests. --- dlls/msvcp90/tests/misc.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index e7f88c5..19a5854 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -58,7 +58,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); -static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); +static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); #undef __thiscall #ifdef __i386__ @@ -362,16 +362,16 @@ static void test__Getctype(void) { MSVCP__Ctypevec ret; - ret = p__Getctype(); + ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); p_free(ret.table); - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; - ret = p__Getctype(); - ok(ret.handle == 1, "ret.handle = %d\n", ret.handle); + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); @@ -418,6 +418,7 @@ static void test_virtual_call(void) char str2[] = "TEST"; int ret; + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; call_func2(p_collate_char_ctor_refs, this, 0); ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret);

1 0

Piotr Caban : msvcp90/tests: Added _Getcoll tests.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: b4da8894e637b08902ab8ad1000a4d90798ded67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4da8894e637b08902ab8ad10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 2 18:32:33 2012 +0200 msvcp90/tests: Added _Getcoll tests. --- dlls/msvcp90/tests/misc.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 19a5854..7d9ef39 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -30,6 +30,11 @@ typedef struct { int delfl; } MSVCP__Ctypevec; +typedef struct { + LCID handle; + unsigned page; +} MSVCP__Collvec; + /* basic_string<char, char_traits<char>, allocator<char>> */ #define BUF_SIZE_CHAR 16 typedef struct @@ -59,6 +64,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); +static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); #undef __thiscall #ifdef __i386__ @@ -172,6 +178,7 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p__Getctype, "_Getctype"); + SET(p__Getcoll, "_Getcoll"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -378,6 +385,27 @@ static void test__Getctype(void) p_free(ret.table); } +static void test__Getcoll(void) +{ + ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); + + union { + MSVCP__Collvec collvec; + ULONGLONG ull; + }ret; + + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + ret.ull = 0; + p__Getcoll_arg = (void*)p__Getcoll; + p__Getcoll_arg(&ret.collvec); + ok(ret.collvec.handle == 0, "ret.handle = %x\n", ret.collvec.handle); + ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); + + ret.ull = p__Getcoll(); + ok(ret.collvec.handle == 0x7654321, "ret.collvec.handle = %x\n", ret.collvec.handle); + ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -446,6 +474,7 @@ START_TEST(misc) test_Copy_s(); test_wctype(); test__Getctype(); + test__Getcoll(); test_virtual_call(); test_allocator_char();

1 0

Henri Verbeet : winex11: Get rid of some unused prototypes.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 0fda9d95a5c49e10880fb3616e394f9d323b6363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fda9d95a5c49e10880fb3616… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 2 14:46:00 2012 +0200 winex11: Get rid of some unused prototypes. --- dlls/winex11.drv/x11drv.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index df01379..a4a4f0d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -220,8 +220,6 @@ extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; extern const int X11DRV_XROPfunction[]; -extern void _XInitImageFuncPtrs(XImage *) DECLSPEC_HIDDEN; - extern int client_side_with_render DECLSPEC_HIDDEN; extern int client_side_antialias_with_core DECLSPEC_HIDDEN; extern int client_side_antialias_with_render DECLSPEC_HIDDEN; @@ -649,8 +647,6 @@ extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int he extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; -extern int X11DRV_Settings_CreateDriver(LPDDHALINFO info) DECLSPEC_HIDDEN; -extern LPDDHALMODEINFO X11DRV_Settings_CreateModes(unsigned int max_modes, int reserve_depths) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; void X11DRV_Settings_Init(void) DECLSPEC_HIDDEN; LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,

1 0

Nikolay Sivov : msxml3: Correct IEnumVARIANT regarding IUnknown forwarding.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 60dd1c6a6eca6205f3838b4c96863639967d99f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dd1c6a6eca6205f3838b4c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 30 16:16:33 2012 +0400 msxml3: Correct IEnumVARIANT regarding IUnknown forwarding. --- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/selection.c | 14 +++++- dlls/msxml3/tests/domdoc.c | 93 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 5710d48..f948fcf 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -40,7 +40,7 @@ #include "wine/debug.h" /* This file implements the object returned by childNodes property. Note that this is - * not the IXMLDOMNodeList returned by XPath querites - it's implemented in queryresult.c. + * not the IXMLDOMNodeList returned by XPath queries - it's implemented in selection.c. * They are different because the list returned by childNodes: * - is "live" - changes to the XML tree are automatically reflected in the list * - doesn't supports IXMLDOMSelection diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index ba173f9..55873bb 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -433,8 +433,14 @@ static HRESULT WINAPI enumvariant_QueryInterface( *ppvObject = NULL; - if ( IsEqualGUID( riid, &IID_IUnknown ) || - IsEqualGUID( riid, &IID_IEnumVARIANT )) + if (IsEqualGUID( riid, &IID_IUnknown )) + { + if (This->own) + *ppvObject = &This->IEnumVARIANT_iface; + else + return IXMLDOMSelection_QueryInterface(This->selection, riid, ppvObject); + } + else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) { *ppvObject = &This->IEnumVARIANT_iface; } @@ -563,7 +569,9 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow if (This->own) IXMLDOMSelection_AddRef(selection); - return IEnumVARIANT_QueryInterface(&This->IEnumVARIANT_iface, &IID_IUnknown, (void**)penum); + *penum = (IUnknown*)&This->IEnumVARIANT_iface; + IUnknown_AddRef(*penum); + return S_OK; } static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7a02e19..4b73d47 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4122,13 +4122,15 @@ static void test_get_text(void) static void test_get_childNodes(void) { - BSTR str; + IXMLDOMNodeList *node_list, *node_list2; + IEnumVARIANT *enum1, *enum2, *enum3; VARIANT_BOOL b; IXMLDOMDocument *doc; - IXMLDOMElement *element; IXMLDOMNode *node, *node2; - IXMLDOMNodeList *node_list, *node_list2; + IXMLDOMElement *element; + IUnknown *unk1, *unk2; HRESULT hr; + BSTR str; LONG len; doc = create_document(&IID_IXMLDOMDocument); @@ -4148,6 +4150,58 @@ static void test_get_childNodes(void) EXPECT_HR(hr, S_OK); ok( len == 4, "len %d\n", len); + /* refcount tests for IEnumVARIANT support */ + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum1); +if (hr == S_OK) +{ + EXPECT_REF(node_list, 1); + EXPECT_REF(enum1, 2); + + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 1); + ok(enum2 == enum1, "got %p, %p\n", enum2, enum1); + IEnumVARIANT_Release(enum2); + + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 3); + EXPECT_REF(enum1, 2); + ok(unk1 == unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 2); + EXPECT_REF(enum2, 1); + ok(enum2 != enum1, "got %p, %p\n", enum2, enum1); + + /* enumerator created with _newEnum() doesn't share IUnknown* with main object */ + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 3); + EXPECT_REF(enum2, 2); + ok(unk1 != unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum3); + EXPECT_HR(hr, S_OK); + ok(enum2 != enum3, "got %p, %p\n", enum2, enum3); + IEnumVARIANT_Release(enum3); + IEnumVARIANT_Release(enum2); + + IEnumVARIANT_Release(enum1); +} + hr = IXMLDOMNodeList_get_item( node_list, 2, &node ); EXPECT_HR(hr, S_OK); @@ -10171,6 +10225,7 @@ static void test_selection(void) IXMLDOMSelection *selection, *selection2; IEnumVARIANT *enum1, *enum2, *enum3; IXMLDOMNodeList *list; + IUnknown *unk1, *unk2; IXMLDOMDocument *doc; IDispatchEx *dispex; IXMLDOMNode *node; @@ -10218,6 +10273,25 @@ static void test_selection(void) ok(enum1 != NULL, "got %p\n", enum1); EXPECT_REF(enum1, 2); + EXPECT_REF(selection, 1); + hr = IXMLDOMSelection_QueryInterface(selection, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 2); + EXPECT_REF(enum1, 2); + + /* enumerator and selection object return same IUnknown* */ + hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 3); + EXPECT_REF(enum1, 2); + ok(unk2 == unk1, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk2); + + EXPECT_REF(selection, 2); + IEnumVARIANT_AddRef(enum1); + EXPECT_REF(selection, 2); + IEnumVARIANT_Release(enum1); + enum3 = NULL; hr = IXMLDOMSelection_QueryInterface(selection, &IID_IEnumVARIANT, (void**)&enum3); EXPECT_HR(hr, S_OK); @@ -10226,7 +10300,7 @@ static void test_selection(void) EXPECT_REF(enum1, 3); IEnumVARIANT_Release(enum3); - EXPECT_REF(selection, 1); + EXPECT_REF(selection, 2); EXPECT_REF(enum1, 2); enum2 = NULL; @@ -10234,12 +10308,20 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(enum2 != NULL, "got %p\n", enum2); - EXPECT_REF(selection, 2); + EXPECT_REF(selection, 3); EXPECT_REF(enum1, 2); EXPECT_REF(enum2, 1); ok(enum1 != enum2, "got %p, %p\n", enum1, enum2); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 3); + EXPECT_REF(enum2, 2); + ok(unk2 != unk1, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk2); + IUnknown_Release(unk1); + selection2 = NULL; hr = IEnumVARIANT_QueryInterface(enum1, &IID_IXMLDOMSelection, (void**)&selection2); EXPECT_HR(hr, S_OK); @@ -10368,6 +10450,7 @@ static void test_selection(void) SysFreeString(name); IXMLDOMNode_Release(node); VariantClear(&v); + IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); EXPECT_HR(hr, S_OK);

1 0