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

Piotr Caban : msvcp90/tests: Added _Getcoll tests.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Hans Leidekker : wbemprox: Support overriding the CIM to VARIANT type mapping for integer properties.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Piotr Caban : msvcp90: Fix __cdecl functions definitions that returns structures.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Jacek Caban : wininet: Try harder to reuse connection after authorization.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Hans Leidekker : wbemprox: Fix the CIM to VARIANT type mapping for a couple of properties.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Nikolay Sivov : msxml3: Make it possible to use different outer objects with single IEnumVARIANT implementation .
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 27eedd5f5eae5d62e5c8c13f3b47d5b2f9c59029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27eedd5f5eae5d62e5c8c13f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 30 20:34:27 2012 +0400 msxml3: Make it possible to use different outer objects with single IEnumVARIANT implementation. --- dlls/msxml3/selection.c | 71 ++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 3cbf4e9..b41e323 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -59,18 +59,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); int registerNamespaces(xmlXPathContextPtr ctxt); xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str); -typedef struct _enumvariant +struct enumvariant_funcs +{ + HRESULT (*get_item)(IUnknown*, LONG, IDispatch**); + HRESULT (*next)(IUnknown*); +}; + +typedef struct { IEnumVARIANT IEnumVARIANT_iface; LONG ref; - IXMLDOMSelection *selection; + IUnknown *outer; BOOL own; LONG pos; + + const struct enumvariant_funcs *funcs; } enumvariant; -typedef struct _domselection +typedef struct { DispatchEx dispex; IXMLDOMSelection IXMLDOMSelection_iface; @@ -81,6 +89,24 @@ typedef struct _domselection IEnumVARIANT *enumvariant; } domselection; +static HRESULT selection_get_item(IUnknown *iface, LONG index, IDispatch** item) +{ + return IXMLDOMSelection_get_item((IXMLDOMSelection*)iface, index, (IXMLDOMNode**)item); +} + +static HRESULT selection_next(IUnknown *iface) +{ + IXMLDOMNode *node; + HRESULT hr = IXMLDOMSelection_nextNode((IXMLDOMSelection*)iface, &node); + if (hr == S_OK) IXMLDOMNode_Release(node); + return hr; +} + +static const struct enumvariant_funcs selection_enumvariant = { + selection_get_item, + selection_next +}; + static inline domselection *impl_from_IXMLDOMSelection( IXMLDOMSelection *iface ) { return CONTAINING_RECORD(iface, domselection, IXMLDOMSelection_iface); @@ -91,7 +117,7 @@ static inline enumvariant *impl_from_IEnumVARIANT( IEnumVARIANT *iface ) return CONTAINING_RECORD(iface, enumvariant, IEnumVARIANT_iface); } -static HRESULT create_enumvariant(IXMLDOMSelection*, BOOL, IUnknown**); +static HRESULT create_enumvariant(IUnknown*, BOOL, IEnumVARIANT**); static HRESULT WINAPI domselection_QueryInterface( IXMLDOMSelection *iface, @@ -115,7 +141,7 @@ static HRESULT WINAPI domselection_QueryInterface( { if (!This->enumvariant) { - HRESULT hr = create_enumvariant(iface, FALSE, (IUnknown**)&This->enumvariant); + HRESULT hr = create_enumvariant((IUnknown*)iface, FALSE, &This->enumvariant); if (FAILED(hr)) return hr; } @@ -284,13 +310,13 @@ static HRESULT WINAPI domselection_reset( static HRESULT WINAPI domselection_get__newEnum( IXMLDOMSelection* iface, - IUnknown** ppUnk) + IUnknown** enumv) { domselection *This = impl_from_IXMLDOMSelection( iface ); - TRACE("(%p)->(%p)\n", This, ppUnk); + TRACE("(%p)->(%p)\n", This, enumv); - return create_enumvariant(iface, TRUE, ppUnk); + return create_enumvariant((IUnknown*)iface, TRUE, (IEnumVARIANT**)enumv); } static HRESULT WINAPI domselection_get_expr( @@ -438,14 +464,14 @@ static HRESULT WINAPI enumvariant_QueryInterface( if (This->own) *ppvObject = &This->IEnumVARIANT_iface; else - return IXMLDOMSelection_QueryInterface(This->selection, riid, ppvObject); + return IUnknown_QueryInterface(This->outer, riid, ppvObject); } else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) { *ppvObject = &This->IEnumVARIANT_iface; } else - return IXMLDOMSelection_QueryInterface(This->selection, riid, ppvObject); + return IUnknown_QueryInterface(This->outer, riid, ppvObject); IEnumVARIANT_AddRef( iface ); @@ -468,7 +494,7 @@ static ULONG WINAPI enumvariant_Release(IEnumVARIANT *iface ) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { - if (This->own) IXMLDOMSelection_Release(This->selection); + if (This->own) IUnknown_Release(This->outer); heap_free(This); } @@ -482,7 +508,6 @@ static HRESULT WINAPI enumvariant_Next( ULONG *fetched) { enumvariant *This = impl_from_IEnumVARIANT( iface ); - IXMLDOMNode *node; ULONG ret_count = 0; TRACE("(%p)->(%u %p %p)\n", This, celt, var, fetched); @@ -496,13 +521,9 @@ static HRESULT WINAPI enumvariant_Next( IDispatch *disp = NULL; HRESULT hr; - node = NULL; - hr = IXMLDOMSelection_get_item(This->selection, This->pos, &node); + hr = This->funcs->get_item(This->outer, This->pos, &disp); if (hr != S_OK) break; - IXMLDOMNode_QueryInterface(node, &IID_IDispatch, (void**)&disp); - IXMLDOMNode_Release(node); - V_VT(var) = VT_DISPATCH; V_DISPATCH(var) = disp; @@ -514,9 +535,8 @@ static HRESULT WINAPI enumvariant_Next( /* we need to advance one step more for some reason */ if (ret_count) { - node = NULL; - IXMLDOMSelection_nextNode(This->selection, &node); - if (node) IXMLDOMNode_Release(node); + if (This->funcs->next) + This->funcs->next(This->outer); } return celt == 0 ? S_OK : S_FALSE; @@ -557,7 +577,7 @@ static const struct IEnumVARIANTVtbl EnumVARIANTVtbl = enumvariant_Clone }; -static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknown **penum) +static HRESULT create_enumvariant(IUnknown *outer, BOOL own, IEnumVARIANT **penum) { enumvariant *This; @@ -566,15 +586,16 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow This->IEnumVARIANT_iface.lpVtbl = &EnumVARIANTVtbl; This->ref = 0; - This->selection = selection; + This->outer = outer; This->own = own; This->pos = 0; + This->funcs = &selection_enumvariant; if (This->own) - IXMLDOMSelection_AddRef(selection); + IUnknown_AddRef(This->outer); - *penum = (IUnknown*)&This->IEnumVARIANT_iface; - IUnknown_AddRef(*penum); + *penum = &This->IEnumVARIANT_iface; + IEnumVARIANT_AddRef(*penum); return S_OK; }

1 0

Nikolay Sivov : msxml3: Fix node interface leak after nextNode().
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: f139a88fd5b5df6baac1b1d1bbce2113a7e68adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f139a88fd5b5df6baac1b1d1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 30 17:48:44 2012 +0400 msxml3: Fix node interface leak after nextNode(). --- dlls/msxml3/selection.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 55873bb..3cbf4e9 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -513,7 +513,11 @@ static HRESULT WINAPI enumvariant_Next( /* we need to advance one step more for some reason */ if (ret_count) + { + node = NULL; IXMLDOMSelection_nextNode(This->selection, &node); + if (node) IXMLDOMNode_Release(node); + } return celt == 0 ? S_OK : S_FALSE; }

1 0

Nikolay Sivov : msxml3: Fix putref_schemas()/get_schemas() behaviour on NULL pointer.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 2b5dd13a0ab6f59a6976ccaffd254a911f6218eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5dd13a0ab6f59a6976ccaff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 1 22:27:17 2012 +0400 msxml3: Fix putref_schemas()/get_schemas() behaviour on NULL pointer. --- dlls/msxml3/domdoc.c | 33 ++++++++++++-------- dlls/msxml3/tests/domdoc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5097ff6..080eb3d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2553,22 +2553,23 @@ static HRESULT WINAPI domdoc_get_namespaces( static HRESULT WINAPI domdoc_get_schemas( IXMLDOMDocument3* iface, - VARIANT* var1 ) + VARIANT* schema ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - HRESULT hr = S_FALSE; IXMLDOMSchemaCollection2* cur_schema = This->properties->schemaCache; + HRESULT hr = S_FALSE; - TRACE("(%p)->(%p)\n", This, var1); + TRACE("(%p)->(%p)\n", This, schema); - VariantInit(var1); /* Test shows we don't call VariantClear here */ - V_VT(var1) = VT_NULL; + V_VT(schema) = VT_NULL; + /* just to reset pointer part, cause that's what application is expected to use */ + V_DISPATCH(schema) = NULL; if(cur_schema) { - hr = IXMLDOMSchemaCollection2_QueryInterface(cur_schema, &IID_IDispatch, (void**)&V_DISPATCH(var1)); + hr = IXMLDOMSchemaCollection2_QueryInterface(cur_schema, &IID_IDispatch, (void**)&V_DISPATCH(schema)); if(SUCCEEDED(hr)) - V_VT(var1) = VT_DISPATCH; + V_VT(schema) = VT_DISPATCH; } return hr; } @@ -2585,13 +2586,19 @@ static HRESULT WINAPI domdoc_putref_schemas( switch(V_VT(&schema)) { case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); - break; - + if (V_UNKNOWN(&schema)) + { + hr = IUnknown_QueryInterface(V_UNKNOWN(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + break; + } + /* fallthrough */ case VT_DISPATCH: - hr = IDispatch_QueryInterface(V_DISPATCH(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); - break; - + if (V_DISPATCH(&schema)) + { + hr = IDispatch_QueryInterface(V_DISPATCH(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + break; + } + /* fallthrough */ case VT_NULL: case VT_EMPTY: hr = S_OK; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 58b170c..5dc2581 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12055,6 +12055,78 @@ static void test_put_data(void) free_bstrs(); } +static void test_putref_schemas(void) +{ + IXMLDOMSchemaCollection *cache; + IXMLDOMDocument2 *doc; + VARIANT schema; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument2); + if (!doc) return; + cache = create_cache(&IID_IXMLDOMSchemaCollection); + + /* set to NULL iface when no schema is set */ + V_VT(&schema) = VT_DISPATCH; + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_VT(&schema) = VT_UNKNOWN; + V_UNKNOWN(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + /* set as VT_DISPATCH, reset with it */ + V_VT(&schema) = VT_DISPATCH; + V_DISPATCH(&schema) = (IDispatch*)cache; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_OK); + ok(V_DISPATCH(&schema) == (IDispatch*)cache, "got %p\n", V_DISPATCH(&schema)); + + V_VT(&schema) = VT_DISPATCH; + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = (IDispatch*)0xdeadbeef; + V_VT(&schema) = VT_I2; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_FALSE); + ok(V_DISPATCH(&schema) == NULL, "got %p\n", V_DISPATCH(&schema)); + ok(V_VT(&schema) == VT_NULL, "got %d\n", V_VT(&schema)); + + /* set as VT_UNKNOWN, reset with it */ + V_VT(&schema) = VT_UNKNOWN; + V_UNKNOWN(&schema) = (IUnknown*)cache; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = NULL; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_OK); + ok(V_DISPATCH(&schema) == (IDispatch*)cache, "got %p\n", V_DISPATCH(&schema)); + + V_VT(&schema) = VT_UNKNOWN; + V_UNKNOWN(&schema) = NULL; + hr = IXMLDOMDocument2_putref_schemas(doc, schema); + EXPECT_HR(hr, S_OK); + + V_DISPATCH(&schema) = (IDispatch*)0xdeadbeef; + V_VT(&schema) = VT_I2; + hr = IXMLDOMDocument2_get_schemas(doc, &schema); + EXPECT_HR(hr, S_FALSE); + ok(V_DISPATCH(&schema) == NULL, "got %p\n", V_DISPATCH(&schema)); + ok(V_VT(&schema) == VT_NULL, "got %d\n", V_VT(&schema)); + + IXMLDOMSchemaCollection_Release(cache); + IXMLDOMDocument2_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12134,6 +12206,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_putref_schemas(); test_xsltemplate();

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXLoadVolumeFromMemory.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 09519eece10bc0fed86cf8ddfd22c97fc26a207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09519eece10bc0fed86cf8ddf… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 29 14:16:59 2012 +0200 d3dx9/tests: Add tests for D3DXLoadVolumeFromMemory. --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/volume.c | 217 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09519eece10bc0fed86cf…

1 0

Michael Stefaniuc : qedit: Support COM aggregation for MediaDet.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 855046fe874c10419b933f1ddf4743c646847531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855046fe874c10419b933f1dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jul 1 00:06:15 2012 +0200 qedit: Support COM aggregation for MediaDet. --- dlls/qedit/mediadet.c | 101 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 73 insertions(+), 28 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index a88dc9d..fea3aa4 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -33,8 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct MediaDetImpl { + IUnknown IUnknown_inner; IMediaDet IMediaDet_iface; - LONG refCount; + IUnknown *outer_unk; + LONG ref; IGraphBuilder *graph; IBaseFilter *source; IBaseFilter *splitter; @@ -43,6 +45,11 @@ typedef struct MediaDetImpl { IPin *cur_pin; } MediaDetImpl; +static inline MediaDetImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, MediaDetImpl, IUnknown_inner); +} + static inline MediaDetImpl *impl_from_IMediaDet(IMediaDet *iface) { return CONTAINING_RECORD(iface, MediaDetImpl, IMediaDet_iface); @@ -62,45 +69,79 @@ static void MD_cleanup(MediaDetImpl *This) This->cur_stream = 0; } -static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) +/* MediaDet inner IUnknown */ +static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); - return refCount; + MediaDetImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if IsEqualIID(riid, &IID_IMediaDet) + *ppv = &This->IMediaDet_iface; + else + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + + if (!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI MediaDet_Release(IMediaDet* iface) +static ULONG WINAPI MediaDet_inner_AddRef(IUnknown *iface) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + MediaDetImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI MediaDet_inner_Release(IUnknown *iface) +{ + MediaDetImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); - if (refCount == 0) + if (ref == 0) { MD_cleanup(This); CoTaskMemFree(This); return 0; } - return refCount; + return ref; } -static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid, - void **ppvObject) +static const IUnknownVtbl mediadet_vtbl = +{ + MediaDet_inner_QueryInterface, + MediaDet_inner_AddRef, + MediaDet_inner_Release, +}; + +/* IMediaDet implementation */ +static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet *iface, REFIID riid, void **ppv) { MediaDetImpl *This = impl_from_IMediaDet(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IMediaDet)) { - MediaDet_AddRef(iface); - *ppvObject = This; - return S_OK; - } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; +static ULONG WINAPI MediaDet_AddRef(IMediaDet *iface) +{ + MediaDetImpl *This = impl_from_IMediaDet(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI MediaDet_Release(IMediaDet *iface) +{ + MediaDetImpl *This = impl_from_IMediaDet(iface); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) @@ -603,9 +644,6 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { TRACE("(%p,%p)\n", ppv, pUnkOuter); - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); if (NULL == obj) { *ppv = NULL; @@ -613,7 +651,8 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { } ZeroMemory(obj, sizeof(MediaDetImpl)); - obj->refCount = 1; + obj->ref = 1; + obj->IUnknown_inner.lpVtbl = &mediadet_vtbl; obj->IMediaDet_iface.lpVtbl = &IMediaDet_VTable; obj->graph = NULL; obj->source = NULL; @@ -623,5 +662,11 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->cur_stream = 0; *ppv = obj; + if (pUnkOuter) + obj->outer_unk = pUnkOuter; + else + obj->outer_unk = &obj->IUnknown_inner; + + *ppv = &obj->IUnknown_inner; return S_OK; }

1 0