wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Jacek Caban : secur32: Report SecPkgContext_ConnectionInfo in bits, not bytes.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 64c84ef5c409c03a8d2ccb993552b3eb976e854d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c84ef5c409c03a8d2ccb993… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 15:36:18 2013 +0100 secur32: Report SecPkgContext_ConnectionInfo in bits, not bytes. --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/tests/schannel.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index fa68591..b273e96 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -309,9 +309,9 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, info->dwProtocol = schannel_get_protocol(proto); info->aiCipher = schannel_get_cipher_algid(alg); - info->dwCipherStrength = pgnutls_cipher_get_key_size(alg); + info->dwCipherStrength = pgnutls_cipher_get_key_size(alg) * 8; info->aiHash = schannel_get_mac_algid(mac); - info->dwHashStrength = pgnutls_mac_get_key_size(mac); + info->dwHashStrength = pgnutls_mac_get_key_size(mac) * 8; info->aiExch = schannel_get_kx_algid(kx); /* FIXME: info->dwExchStrength? */ info->dwExchStrength = 0; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ddcc87d..7d4c532 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -592,6 +592,7 @@ static void test_communication(void) CredHandle cred_handle; CtxtHandle context; SecPkgContext_StreamSizes sizes; + SecPkgContext_ConnectionInfo conn_info; CERT_CONTEXT *cert; SecBufferDesc buffers[2]; @@ -754,6 +755,13 @@ static void test_communication(void) pCertFreeCertificateContext(cert); } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); + if(status == SEC_E_OK) { + ok(conn_info.dwCipherStrength == 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); + } + pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); reset_buffers(&buffers[0]);

1 0

Jacek Caban : vbscript: Fixed chr(0) implementation.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: b58dadf03b75d703387c6c9a3732a487084d026e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58dadf03b75d703387c6c9a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:43 2013 +0100 vbscript: Fixed chr(0) implementation. --- dlls/vbscript/global.c | 2 +- dlls/vbscript/tests/api.vbs | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index cba611f..5b4af6f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1088,7 +1088,7 @@ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA if(FAILED(hres)) return hres; - if(c <= 0 || c >= 0x100) { + if(c < 0 || c >= 0x100) { FIXME("invalid arg\n"); return E_FAIL; } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index fc057d8..3e53813 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -119,6 +119,7 @@ if isEnglishLang then TestCStr true, "True" Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) +Call ok(Chr(0) <> "", "Chr(0) = """"") Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass

1 0

Jacek Caban : vbscript: Added color constants.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 34bf93fc51c78960a009f87b71c1223bf0edc7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34bf93fc51c78960a009f87b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:32 2013 +0100 vbscript: Added color constants. --- dlls/vbscript/global.c | 64 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 8 +++++ 2 files changed, 16 insertions(+), 56 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab3965e..cba611f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,54 +1609,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbBlack(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBlue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCyan(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbGreen(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMagenta(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbRed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbWhite(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbYellow(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1776,14 +1728,14 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBLONGTIME, NULL, BP_GET, VT_I2, 3}, {DISPID_GLOBAL_VBSHORTTIME, NULL, BP_GET, VT_I2, 4}, {DISPID_GLOBAL_VBOBJECTERROR, NULL, BP_GET, VT_I4, 0x80040000}, - {DISPID_GLOBAL_VBBLACK, Global_vbBlack, BP_GET}, - {DISPID_GLOBAL_VBBLUE, Global_vbBlue, BP_GET}, - {DISPID_GLOBAL_VBCYAN, Global_vbCyan, BP_GET}, - {DISPID_GLOBAL_VBGREEN, Global_vbGreen, BP_GET}, - {DISPID_GLOBAL_VBMAGENTA, Global_vbMagenta, BP_GET}, - {DISPID_GLOBAL_VBRED, Global_vbRed, BP_GET}, - {DISPID_GLOBAL_VBWHITE, Global_vbWhite, BP_GET}, - {DISPID_GLOBAL_VBYELLOW, Global_vbYellow, BP_GET}, + {DISPID_GLOBAL_VBBLACK, NULL, BP_GET, VT_I4, 0x000000}, + {DISPID_GLOBAL_VBBLUE, NULL, BP_GET, VT_I4, 0xff0000}, + {DISPID_GLOBAL_VBCYAN, NULL, BP_GET, VT_I4, 0xffff00}, + {DISPID_GLOBAL_VBGREEN, NULL, BP_GET, VT_I4, 0x00ff00}, + {DISPID_GLOBAL_VBMAGENTA, NULL, BP_GET, VT_I4, 0xff00ff}, + {DISPID_GLOBAL_VBRED, NULL, BP_GET, VT_I4, 0x0000ff}, + {DISPID_GLOBAL_VBWHITE, NULL, BP_GET, VT_I4, 0xffffff}, + {DISPID_GLOBAL_VBYELLOW, NULL, BP_GET, VT_I4, 0x00ffff}, {DISPID_GLOBAL_VBCR, Global_vbCr, BP_GET}, {DISPID_GLOBAL_VBCRLF, Global_vbCrLf, BP_GET}, {DISPID_GLOBAL_VBNEWLINE, Global_vbNewLine, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ee68e9e..fc057d8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -95,6 +95,14 @@ TestConstant "vbShortDate", vbShortDate, 2 TestConstant "vbLongTime", vbLongTime, 3 TestConstant "vbShortTime", vbShortTime, 4 TestConstantI4 "vbObjectError", vbObjectError, &h80040000& +TestConstantI4 "vbBlack", vbBlack, 0 +TestConstantI4 "vbBlue", vbBlue, &hff0000& +TestConstantI4 "vbCyan", vbCyan, &hffff00& +TestConstantI4 "vbGreen", vbGreen, &h00ff00& +TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& +TestConstantI4 "vbRed", vbRed, &h0000ff& +TestConstantI4 "vbWhite", vbWhite, &hffffff& +TestConstantI4 "vbYellow", vbYellow, &h00ffff& Sub TestCStr(arg, exval) dim x

1 0

Jacek Caban : vbscript: Make constant type explicit.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 6a6c323306681ef2a422f9711bde6271be9c0d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6c323306681ef2a422f9711… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:19 2013 +0100 vbscript: Make constant type explicit. --- dlls/vbscript/global.c | 136 ++++++++++++++++++++++++------------------------ dlls/vbscript/vbdisp.c | 11 +++- 2 files changed, 76 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a6c323306681ef2a422f…

1 0

Hans Leidekker : msi: Don't attempt to patch files from disabled components .
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: b36a26d65a36625af0081024ea3ec041011bb07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36a26d65a36625af0081024e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 12:31:13 2013 +0100 msi: Don't attempt to patch files from disabled components. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 96584df..d53da91 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -466,7 +466,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (temp_folder[0] == '\0') GetTempPathW(MAX_PATH, temp_folder); - if (!(p = get_next_filepatch(package, file))) return FALSE; + if (!(p = get_next_filepatch(package, file)) || !p->File->Component->Enabled) + return FALSE; GetTempFileNameW(temp_folder, NULL, 0, patch_path);

1 0

Hans Leidekker : msi: Handle more than one patch per file.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: aeb7d70ffdbb40c62beede410eefac9c776a2443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb7d70ffdbb40c62beede410… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 12:30:37 2013 +0100 msi: Handle more than one patch per file. --- dlls/msi/action.c | 12 ------------ dlls/msi/files.c | 19 +++++++++++++------ dlls/msi/msipriv.h | 1 - 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d48ecdd..827a0c8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -684,18 +684,6 @@ MSIFILE *msi_get_loaded_file( MSIPACKAGE *package, const WCHAR *key ) return NULL; } -MSIFILEPATCH *msi_get_loaded_filepatch( MSIPACKAGE *package, const WCHAR *key ) -{ - MSIFILEPATCH *patch; - - /* FIXME: There might be more than one patch */ - LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) - { - if (!strcmpW( key, patch->File->File )) return patch; - } - return NULL; -} - MSIFOLDER *msi_get_loaded_folder( MSIPACKAGE *package, const WCHAR *dir ) { MSIFOLDER *folder; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7202fb6..96584df 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -443,6 +443,17 @@ static void unload_mspatch(void) FreeLibrary(hmspatcha); } +static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) +{ + MSIFILEPATCH *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) + { + if (!patch->IsApplied && !strcmpW( key, patch->File->File )) return patch; + } + return NULL; +} + static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -455,12 +466,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (temp_folder[0] == '\0') GetTempPathW(MAX_PATH, temp_folder); - p = msi_get_loaded_filepatch(package, file); - if (!p) - { - TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); - return FALSE; - } + if (!(p = get_next_filepatch(package, file))) return FALSE; + GetTempFileNameW(temp_folder, NULL, 0, patch_path); *path = strdupW(patch_path); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c477405..018f405 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1018,7 +1018,6 @@ extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDE extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; -extern MSIFILEPATCH *msi_get_loaded_filepatch(MSIPACKAGE* package, const WCHAR *key) DECLSPEC_HIDDEN; extern MSIFOLDER *msi_get_loaded_folder(MSIPACKAGE *package, const WCHAR *dir) DECLSPEC_HIDDEN; extern int msi_track_tempfile(MSIPACKAGE *package, const WCHAR *path) DECLSPEC_HIDDEN; extern void msi_free_action_script(MSIPACKAGE *package, UINT script) DECLSPEC_HIDDEN;

1 0

Alessandro Pignotti : quartz: Check byte patterns in GetFileSourceFilter.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: e583f8806eea8928d845dff1953f706d2c3ea207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e583f8806eea8928d845dff19… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:57:50 2013 +0100 quartz: Check byte patterns in GetFileSourceFilter. The idea is to create a temporary AsyncReader and use it to match a better filter. If no match is found the temporary filter is returned. --- dlls/quartz/filesource.c | 15 ++++- dlls/quartz/filtergraph.c | 133 +++++++++++++++++++++++++++------------------ 2 files changed, 92 insertions(+), 56 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 5bde1e5..95e146d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -295,7 +295,8 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK) bFound = TRUE; } - else + /* We need a reader interface to check bytes */ + else if (pReader) { DWORD indexMinor; @@ -305,7 +306,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * WCHAR wszMinorKeyName[CHARS_IN_GUID]; DWORD dwMinorKeyNameLen = sizeof(wszMinorKeyName) / sizeof(wszMinorKeyName[0]); WCHAR wszSourceFilterKeyName[CHARS_IN_GUID]; - DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName) / sizeof(wszSourceFilterKeyName[0]); + DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName); DWORD maxValueLen; DWORD indexValue; @@ -370,7 +371,15 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * hr = E_FAIL; } else if (bFound) - TRACE("Found file's class: major = %s, subtype = %s\n", qzdebugstr_guid(majorType), qzdebugstr_guid(minorType)); + { + TRACE("Found file's class:\n"); + if(majorType) + TRACE("\tmajor = %s\n", qzdebugstr_guid(majorType)); + if(minorType) + TRACE("\tsubtype = %s\n", qzdebugstr_guid(minorType)); + if(sourceFilter) + TRACE("\tsource filter = %s\n", qzdebugstr_guid(sourceFilter)); + } return hr; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4140d23..985e568 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1556,61 +1556,97 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw return hr; } +static HRESULT CreateFilterInstanceAndLoadFile(GUID* clsid, LPCOLESTR pszFileName, IBaseFilter **filter) +{ + IFileSourceFilter *source = NULL; + HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + TRACE("CLSID: %s\n", debugstr_guid(clsid)); + if (FAILED(hr)) + return hr; + + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } + + /* Load the file in the file source filter */ + hr = IFileSourceFilter_Load(source, pszFileName, NULL); + IFileSourceFilter_Release(source); + if (FAILED(hr)) { + WARN("Load (%x)\n", hr); + IBaseFilter_Release(*filter); + return hr; + } + + return hr; +} + /* Some filters implement their own asynchronous reader (Theoretically they all should, try to load it first */ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) { - static const WCHAR wszReg[] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s',0}; - HRESULT hr = S_OK; - HKEY extkey; - LONG lRet; + HRESULT hr; + GUID clsid; + IAsyncReader * pReader = NULL; + IFileSourceFilter* pSource = NULL; + IPin * pOutputPin = NULL; + static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszReg, 0, KEY_READ, &extkey); - hr = HRESULT_FROM_WIN32(lRet); + /* Try to find a match without reading the file first */ + hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid); - if (SUCCEEDED(hr)) + if (!hr) + return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); + + /* Now create a AyncReader instance, to check for signature bytes in the file */ + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + if (FAILED(hr)) + return hr; + + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID *)&pSource); + if (FAILED(hr)) { - static const WCHAR filtersource[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; - WCHAR *ext = PathFindExtensionW(pszFileName); - WCHAR clsid_key[39]; - GUID clsid; - DWORD size = sizeof(clsid_key); - HKEY pathkey; + IBaseFilter_Release(*filter); + return hr; + } - if (!ext) - { - CloseHandle(extkey); - return E_FAIL; - } + hr = IFileSourceFilter_Load(pSource, pszFileName, NULL); + IFileSourceFilter_Release(pSource); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - lRet = RegOpenKeyExW(extkey, ext, 0, KEY_READ, &pathkey); - hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(extkey); - if (FAILED(hr)) - return hr; + hr = IBaseFilter_FindPin(*filter, wszOutputPinName, &pOutputPin); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - lRet = RegQueryValueExW(pathkey, filtersource, NULL, NULL, (LPBYTE)clsid_key, &size); - hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(pathkey); - if (FAILED(hr)) - return hr; + hr = IPin_QueryInterface(pOutputPin, &IID_IAsyncReader, (LPVOID *)&pReader); + IPin_Release(pOutputPin); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - CLSIDFromString(clsid_key, &clsid); + /* Try again find a match */ + hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid); + IAsyncReader_Release(pReader); - TRACE("CLSID: %s\n", debugstr_guid(&clsid)); - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); - if (SUCCEEDED(hr)) - { - IFileSourceFilter *source = NULL; - hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); - if (SUCCEEDED(hr)) - IFileSourceFilter_Release(source); - else - IBaseFilter_Release(*filter); - } + if (!hr) + { + /* Release the AsyncReader filter and create the matching one */ + IBaseFilter_Release(*filter); + return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); } - if (FAILED(hr)) - *filter = NULL; - return hr; + + /* Return the AsyncReader filter */ + return S_OK; } static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR lpcwstrFileName, @@ -1627,9 +1663,6 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR /* Try from file name first, then fall back to default asynchronous reader */ hr = GetFileSourceFilter(lpcwstrFileName, &preader); - - if (FAILED(hr)) - hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); if (FAILED(hr)) { WARN("Unable to create file source filter (%x)\n", hr); return hr; @@ -1648,13 +1681,7 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR goto error; } - /* Load the file in the file source filter */ - hr = IFileSourceFilter_Load(pfile, lpcwstrFileName, NULL); - if (FAILED(hr)) { - WARN("Load (%x)\n", hr); - goto error; - } - + /* The file has been already loaded */ IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { WARN("GetCurFile (%x)\n", hr);

1 0

Alessandro Pignotti : quartz: Make GetClassMediaFile visible in the module.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 916854c5a877ccac95558a0180d9bc006c12674c URL: http://source.winehq.org/git/wine.git/?a=commit;h=916854c5a877ccac95558a018… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:29:55 2013 +0100 quartz: Make GetClassMediaFile visible in the module. --- dlls/quartz/filesource.c | 2 +- dlls/quartz/quartz_private.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e81110f..5bde1e5 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -254,7 +254,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p return hr; } -static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) +HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { HKEY hkeyMediaType = NULL; LONG lRet; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index d8bcdbf..af0300e 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -67,4 +67,6 @@ extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; +HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter); + #endif /* __QUARTZ_PRIVATE_INCLUDED__ */

1 0

Alessandro Pignotti : quartz: Modify GetClassMediaFile to also extract the SourceFilter value.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: fb2551c59bb7d3e0205fd668be1a8c531180ad06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2551c59bb7d3e0205fd668b… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:28:50 2013 +0100 quartz: Modify GetClassMediaFile to also extract the SourceFilter value. --- dlls/quartz/filesource.c | 73 ++++++++++++++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f518ec7..e81110f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -79,8 +79,10 @@ static const WCHAR mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; static const WCHAR subtype_name[] = { 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; +static const WCHAR source_filter_name[] = { + 'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; -static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) +static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { WCHAR *extension; LONG l; @@ -100,17 +102,31 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU if (l) return E_FAIL; - size = sizeof(keying); - l = RegQueryValueExW(hsub, mediatype_name, NULL, NULL, (LPBYTE)keying, &size); - if (!l) - CLSIDFromString(keying, majorType); + if (majorType) + { + size = sizeof(keying); + l = RegQueryValueExW(hsub, mediatype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, majorType); + } - size = sizeof(keying); - if (!l) - l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (minorType) + { + size = sizeof(keying); + if (!l) + l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, minorType); + } - if (!l) - CLSIDFromString(keying, minorType); + if (sourceFilter) + { + size = sizeof(keying); + if (!l) + l = RegQueryValueExW(hsub, source_filter_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, sourceFilter); + } RegCloseKey(hsub); @@ -238,7 +254,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p return hr; } -static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) +static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { HKEY hkeyMediaType = NULL; LONG lRet; @@ -248,8 +264,12 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, TRACE("(%p, %s, %p, %p)\n", pReader, debugstr_w(pszFileName), majorType, minorType); - *majorType = GUID_NULL; - *minorType = GUID_NULL; + if(majorType) + *majorType = GUID_NULL; + if(minorType) + *minorType = GUID_NULL; + if(sourceFilter) + *sourceFilter = GUID_NULL; lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &hkeyMediaType); hr = HRESULT_FROM_WIN32(lRet); @@ -272,7 +292,7 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, TRACE("%s\n", debugstr_w(wszMajorKeyName)); if (!strcmpW(wszExtensions, wszMajorKeyName)) { - if (process_extensions(hkeyMajor, pszFileName, majorType, minorType) == S_OK) + if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK) bFound = TRUE; } else @@ -284,6 +304,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, HKEY hkeyMinor; WCHAR wszMinorKeyName[CHARS_IN_GUID]; DWORD dwMinorKeyNameLen = sizeof(wszMinorKeyName) / sizeof(wszMinorKeyName[0]); + WCHAR wszSourceFilterKeyName[CHARS_IN_GUID]; + DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName) / sizeof(wszSourceFilterKeyName[0]); DWORD maxValueLen; DWORD indexValue; @@ -305,7 +327,6 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, LPWSTR wszPatternString = HeapAlloc(GetProcessHeap(), 0, maxValueLen); DWORD dwValueNameLen = sizeof(wszValueName) / sizeof(wszValueName[0]); /* remember this is in chars */ DWORD dwDataLen = maxValueLen; /* remember this is in bytes */ - static const WCHAR wszSourceFilter[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; if (RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen) != ERROR_SUCCESS) { @@ -313,15 +334,25 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, break; } + if (strcmpW(wszValueName, source_filter_name)==0) + continue; + /* if it is not the source filter value */ - if (strcmpW(wszValueName, wszSourceFilter)) + if (process_pattern_string(wszPatternString, pReader) == S_OK) { - if (process_pattern_string(wszPatternString, pReader) == S_OK) + if (majorType && FAILED(CLSIDFromString(wszMajorKeyName, majorType))) + break; + if (minorType && FAILED(CLSIDFromString(wszMinorKeyName, minorType))) + break; + if (sourceFilter) { - if (SUCCEEDED(CLSIDFromString(wszMajorKeyName, majorType)) && - SUCCEEDED(CLSIDFromString(wszMinorKeyName, minorType))) - bFound = TRUE; + /* Look up the source filter key */ + if (RegQueryValueExW(hkeyMinor, source_filter_name, NULL, NULL, (LPBYTE)wszSourceFilterKeyName, &dwSourceFilterKeyNameLen)) + break; + if (FAILED(CLSIDFromString(wszSourceFilterKeyName, sourceFilter))) + break; } + bFound = TRUE; } HeapFree(GetProcessHeap(), 0, wszPatternString); } @@ -605,7 +636,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt->pUnk = NULL; This->pmt->lSampleSize = 0; This->pmt->formattype = FORMAT_None; - hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype); + hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { CoTaskMemFree(This->pmt);

1 0

Nikolay Sivov : msxml3: Update backing docs refcount in put_documentElement ().
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: e5affa70400b67eb2abb66666e5f5eccba17ef5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5affa70400b67eb2abb66666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 10:46:33 2013 +0400 msxml3: Update backing docs refcount in put_documentElement(). --- dlls/msxml3/domdoc.c | 9 +++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fb96ba0..32e9591 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1538,7 +1538,9 @@ static HRESULT WINAPI domdoc_put_documentElement( domdoc *This = impl_from_IXMLDOMDocument3( iface ); IXMLDOMNode *elementNode; xmlNodePtr oldRoot; + xmlDocPtr old_doc; xmlnode *xmlNode; + int refcount = 0; HRESULT hr; TRACE("(%p)->(%p)\n", This, DOMElement); @@ -1554,7 +1556,14 @@ static HRESULT WINAPI domdoc_put_documentElement( if(xmldoc_remove_orphan(xmlNode->node->doc, xmlNode->node) != S_OK) WARN("%p is not an orphan of %p\n", xmlNode->node->doc, xmlNode->node); + old_doc = xmlNode->node->doc; + if (old_doc != get_doc(This)) + refcount = xmlnode_get_inst_cnt(xmlNode); + + /* old root is still orphaned by its document, update refcount from new root */ + if (refcount) xmldoc_add_refs(get_doc(This), refcount); oldRoot = xmlDocSetRootElement( get_doc(This), xmlNode->node); + if (refcount) xmldoc_release_refs(old_doc, refcount); IXMLDOMNode_Release( elementNode ); if(oldRoot) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3109a42..6c24119 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -294,6 +294,7 @@ extern LONG xmldoc_add_ref( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_release( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_add_refs( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; extern LONG xmldoc_release_refs ( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; +extern int xmlnode_get_inst_cnt( xmlnode *node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 20f9ba9..4508609 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -402,7 +402,7 @@ static int node_get_inst_cnt(xmlNodePtr node) return ret; } -static int xmlnode_get_inst_cnt(xmlnode *node) +int xmlnode_get_inst_cnt(xmlnode *node) { return node_get_inst_cnt(node->node); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013