February 2013 - Wine-Commits

Jacek Caban : vbscipt: Added string constants.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 5f3c38ed61d8e062954953ec3a64fba6b19a445d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3c38ed61d8e062954953ec3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:56:05 2013 +0100 vbscipt: Added string constants. --- dlls/vbscript/global.c | 80 ++++++++++--------------------------------- dlls/vbscript/tests/api.vbs | 14 +++++++ dlls/vbscript/vbdisp.c | 12 ++++++ dlls/vbscript/vbscript.h | 7 +++- 4 files changed, 50 insertions(+), 63 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5b4af6f..9ff1f76 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,59 +1609,15 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCrLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNewLine(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFormFeed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullChar(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullString(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbVerticalTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} +static const string_constant_t vbCr = {1, {'\r'}}; +static const string_constant_t vbCrLf = {2, {'\r','\n'}}; +static const string_constant_t vbNewLine = {2, {'\r','\n'}}; +static const string_constant_t vbFormFeed = {1, {0xc}}; +static const string_constant_t vbLf = {1, {'\n'}}; +static const string_constant_t vbNullChar = {1}; +static const string_constant_t vbNullString = {0}; +static const string_constant_t vbTab = {1, {'\t'}}; +static const string_constant_t vbVerticalTab = {1, {0xb}}; static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, VT_I2, 0}, @@ -1736,15 +1692,15 @@ static const builtin_prop_t global_props[] = { {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}, - {DISPID_GLOBAL_VBFORMFEED, Global_vbFormFeed, BP_GET}, - {DISPID_GLOBAL_VBLF, Global_vbLf, BP_GET}, - {DISPID_GLOBAL_VBNULLCHAR, Global_vbNullChar, BP_GET}, - {DISPID_GLOBAL_VBNULLSTRING, Global_vbNullString, BP_GET}, - {DISPID_GLOBAL_VBTAB, Global_vbTab, BP_GET}, - {DISPID_GLOBAL_VBVERTICALTAB, Global_vbVerticalTab, BP_GET}, + {DISPID_GLOBAL_VBCR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCr}, + {DISPID_GLOBAL_VBCRLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCrLf}, + {DISPID_GLOBAL_VBNEWLINE, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNewLine}, + {DISPID_GLOBAL_VBFORMFEED, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, + {DISPID_GLOBAL_VBLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbLf}, + {DISPID_GLOBAL_VBNULLCHAR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullChar}, + {DISPID_GLOBAL_VBNULLSTRING, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullString}, + {DISPID_GLOBAL_VBTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbTab}, + {DISPID_GLOBAL_VBVERTICALTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {DISPID_GLOBAL_CCUR, Global_CCur, 0, 1}, {DISPID_GLOBAL_CINT, Global_CInt, 0, 1}, {DISPID_GLOBAL_CLNG, Global_CLng, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3e53813..0aaeefb 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -48,6 +48,11 @@ Sub TestConstantI4(name, val, exval) Call ok(getVT(val) = "VT_I4*", "getVT(" & name & ") = " & getVT(val)) End Sub +Sub TestConstantBSTR(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_BSTR*", "getVT(" & name & ") = " & getVT(val)) +End Sub + TestConstant "vbEmpty", vbEmpty, 0 TestConstant "vbNull", vbNull, 1 TestConstant "vbLong", vbLong, 3 @@ -103,6 +108,15 @@ TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& TestConstantI4 "vbRed", vbRed, &h0000ff& TestConstantI4 "vbWhite", vbWhite, &hffffff& TestConstantI4 "vbYellow", vbYellow, &h00ffff& +TestConstantBSTR "vbCr", vbCr, Chr(13) +TestConstantBSTR "vbCrLf", vbCrLf, Chr(13)&Chr(10) +TestConstantBSTR "vbNewLine", vbNewLine, Chr(13)&Chr(10) +TestConstantBSTR "vbFormFeed", vbFormFeed, Chr(12) +TestConstantBSTR "vbLf", vbLf, Chr(10) +TestConstantBSTR "vbNullChar", vbNullChar, Chr(0) +TestConstantBSTR "vbNullString", vbNullString, "" +TestConstantBSTR "vbTab", vbTab, chr(9) +TestConstantBSTR "vbVerticalTab", vbVerticalTab, chr(11) Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0c39956..f06a5b6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -160,6 +160,18 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f V_VT(res) = VT_I4; V_I4(res) = val; break; + case VT_BSTR: { + const string_constant_t *str = (const string_constant_t*)prop->max_args; + BSTR ret; + + ret = SysAllocStringLen(str->buf, str->len); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + break; + } default: assert(0); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index db31b47..e25b524 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -86,7 +86,7 @@ typedef struct { HRESULT (*proc)(vbdisp_t*,VARIANT*,unsigned,VARIANT*); DWORD flags; unsigned min_args; - unsigned max_args; + UINT_PTR max_args; } builtin_prop_t; typedef struct _class_desc_t { @@ -334,6 +334,11 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECL HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; +typedef struct { + UINT16 len; + WCHAR buf[7]; +} string_constant_t; + #define TID_LIST \ XDIID(ErrObj) \ XDIID(GlobalObj)

1 0

Jacek Caban : vbscript: Make constant type explicit.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

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

Alessandro Pignotti : quartz: Check byte patterns in GetFileSourceFilter.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

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: Modify GetClassMediaFile to also extract the SourceFilter value.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

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 Feb. 27, 2013

Feb. 27, 2013

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

Nikolay Sivov : msxml3: Better handle cross-tree node moves.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: cb9d787be150af96c75a652341622d086f7da1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9d787be150af96c75a65234… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 00:30:22 2013 +0400 msxml3: Better handle cross-tree node moves. --- dlls/msxml3/domdoc.c | 24 +++++++++++--- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 75 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 91 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f1915a3..fb96ba0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -553,19 +553,28 @@ void xmldoc_init(xmlDocPtr doc, MSXML_VERSION version) priv_from_xmlDocPtr(doc)->properties = create_properties(version); } -LONG xmldoc_add_ref(xmlDocPtr doc) +LONG xmldoc_add_refs(xmlDocPtr doc, LONG refs) { - LONG ref = InterlockedIncrement(&priv_from_xmlDocPtr(doc)->refs); + LONG ref = InterlockedExchangeAdd(&priv_from_xmlDocPtr(doc)->refs, refs) + refs; TRACE("(%p)->(%d)\n", doc, ref); return ref; } -LONG xmldoc_release(xmlDocPtr doc) +LONG xmldoc_add_ref(xmlDocPtr doc) +{ + return xmldoc_add_refs(doc, 1); +} + +LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs) { xmldoc_priv *priv = priv_from_xmlDocPtr(doc); - LONG ref = InterlockedDecrement(&priv->refs); + LONG ref = InterlockedExchangeAdd(&priv->refs, -refs) - refs; TRACE("(%p)->(%d)\n", doc, ref); - if(ref == 0) + + if (ref < 0) + WARN("negative refcount, expect troubles\n"); + + if (ref == 0) { orphan_entry *orphan, *orphan2; TRACE("freeing docptr %p\n", doc); @@ -584,6 +593,11 @@ LONG xmldoc_release(xmlDocPtr doc) return ref; } +LONG xmldoc_release(xmlDocPtr doc) +{ + return xmldoc_release_refs(doc, 1); +} + HRESULT xmldoc_add_orphan(xmlDocPtr doc, xmlNodePtr node) { xmldoc_priv *priv = priv_from_xmlDocPtr(doc); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 66baea8..3109a42 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -292,6 +292,8 @@ extern xmlChar *xmlChar_from_wchar( LPCWSTR str ) DECLSPEC_HIDDEN; extern void xmldoc_init( xmlDocPtr doc, MSXML_VERSION version ) DECLSPEC_HIDDEN; 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 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 867b890..8571955 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -374,11 +374,45 @@ HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) return get_node(This, "next", This->node->next, ret); } +static int node_get_inst_cnt(xmlNodePtr node) +{ + int ret = *(LONG *)&node->_private; + xmlNodePtr child; + + /* add attribute counts */ + if (node->type == XML_ELEMENT_NODE) + { + xmlAttrPtr prop = node->properties; + + while (prop) + { + ret += node_get_inst_cnt((xmlNodePtr)prop); + prop = prop->next; + } + } + + /* add children counts */ + child = node->children; + while (child) + { + ret += node_get_inst_cnt(child); + child = child->next; + } + + return ret; +} + +static int xmlnode_get_inst_cnt(xmlnode *node) +{ + return node_get_inst_cnt(node->node); +} + HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { IXMLDOMNode *before = NULL; xmlnode *node_obj; + int refcount = 0; xmlDocPtr doc; HRESULT hr; @@ -414,6 +448,8 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if(xmldoc_remove_orphan(node_obj->node->doc, node_obj->node) != S_OK) WARN("%p is not an orphan of %p\n", node_obj->node, node_obj->node->doc); + refcount = xmlnode_get_inst_cnt(node_obj); + if(before) { xmlnode *before_node_obj = get_node_obj(before); @@ -426,10 +462,16 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); } + doc = node_obj->node->doc; - xmldoc_add_ref(before_node_obj->node->doc); + + /* refs count including subtree */ + if (doc != before_node_obj->node->doc) + refcount = xmlnode_get_inst_cnt(node_obj); + + if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); xmlAddPrevSibling(before_node_obj->node, node_obj->node); - xmldoc_release(doc); + if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } else @@ -441,11 +483,15 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); } doc = node_obj->node->doc; - xmldoc_add_ref(This->node->doc); + + if (doc != This->node->doc) + refcount = xmlnode_get_inst_cnt(node_obj); + + if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); xmlAddChild(This->node, node_obj->node); - xmldoc_release(doc); + if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } @@ -1017,17 +1063,36 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } +/* _private field holds a number of COM instances spawned from this libxml2 node */ +static void xmlnode_add_ref(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedIncrement((LONG*)&node->_private); +} + +static void xmlnode_release(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedDecrement((LONG*)&node->_private); +} + void destroy_xmlnode(xmlnode *This) { if(This->node) + { + xmlnode_release(This->node); xmldoc_release(This->node->doc); + } release_dispex(&This->dispex); } void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) { if(node) - xmldoc_add_ref( node->doc ); + { + xmlnode_add_ref(node); + xmldoc_add_ref(node->doc); + } This->node = node; This->iface = node_iface;

1 0

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

Feb. 27, 2013

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

André Hentschel : api-ms-win*: Update spec files.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 91cec0e82af0e3f0e79df1db60b55155905bdd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cec0e82af0e3f0e79df1db6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:41:33 2013 +0100 api-ms-win*: Update spec files. --- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 83dc129..e7744a7 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index eacfd60..9d266fa 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall GetAcceptLanguagesW(ptr ptr) shlwapi.GetAcceptLanguagesW @ stdcall HashData(ptr long ptr long) shlwapi.HashData -@ stub IsInternetESCEnabled +@ stdcall IsInternetESCEnabled() shlwapi.IsInternetESCEnabled @ stdcall ParseURLW(wstr ptr) shlwapi.ParseURLW @ stdcall PathAddBackslashA(str) shlwapi.PathAddBackslashA @ stdcall PathAddBackslashW(wstr) shlwapi.PathAddBackslashW diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 9b8ebcf..548ae83 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid

1 0

Michael Stefaniuc : shell32: Finish the COM cleanup of ShellFSFolder.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: a5560ebee68aa6305dc67c3f826aa39b4591821f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5560ebee68aa6305dc67c3f8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:56 2013 +0100 shell32: Finish the COM cleanup of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 57 ++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 516750d..a88961c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -63,8 +63,8 @@ typedef struct { LONG ref; IShellFolder2 IShellFolder2_iface; IPersistFolder3 IPersistFolder3_iface; - const IDropTargetVtbl *lpvtblDropTarget; - const ISFHelperVtbl *lpvtblSFHelper; + IDropTarget IDropTarget_iface; + ISFHelper ISFHelper_iface; IUnknown *outer_unk; CLSID *pclsid; @@ -98,23 +98,16 @@ static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } -static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) +static inline IGenericSFImpl *impl_from_IDropTarget(IDropTarget *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblDropTarget)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IDropTarget_iface); } -static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) +static inline IGenericSFImpl *impl_from_ISFHelper(ISFHelper *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblSFHelper)); + return CONTAINING_RECORD(iface, IGenericSFImpl, ISFHelper_iface); } - -/* - converts This to an interface pointer -*/ -#define _IDropTarget_(This) (&(This)->lpvtblDropTarget) -#define _ISFHelper_(This) (&(This)->lpvtblSFHelper) - /************************************************************************** * registers clipboardformat once */ @@ -146,10 +139,10 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) - *ppvObj = _ISFHelper_ (This); + *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { - *ppvObj = _IDropTarget_ (This); - SF_RegisterClipFmt (This); + *ppvObj = &This->IDropTarget_iface; + SF_RegisterClipFmt(This); } if (*ppvObj) { @@ -230,8 +223,8 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->lpvtblDropTarget = &dtvt; - sf->lpvtblSFHelper = &shvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; @@ -1105,31 +1098,24 @@ static const IShellFolder2Vtbl sfvt = * ISFHelper for IShellFolder implementation */ -static HRESULT WINAPI -ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFHelper_fnQueryInterface(ISFHelper *iface, REFIID riid, void **ppvObj) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnAddRef(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnRelease(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); } @@ -1612,31 +1598,24 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static HRESULT WINAPI -ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFDropTarget_QueryInterface(IDropTarget *iface, REFIID riid, void **ppv) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } -static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_AddRef(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_Release(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); }

1 0

Michael Stefaniuc : shell32: Get rid of a helper function.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 00a20667fa3437c851bdf0e46ec5ff08c47d122e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a20667fa3437c851bdf0e46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:00 2013 +0100 shell32: Get rid of a helper function. --- dlls/shell32/shfldr_fs.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index f52c192..516750d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1612,27 +1612,6 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static BOOL -ISFDropTarget_QueryDrop (IDropTarget * iface, DWORD dwKeyState, - LPDWORD pdwEffect) -{ - DWORD dwEffect = *pdwEffect; - - IGenericSFImpl *This = impl_from_IDropTarget(iface); - - *pdwEffect = DROPEFFECT_NONE; - - if (This->fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - static HRESULT WINAPI ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) { @@ -1673,7 +1652,10 @@ ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL); This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; } @@ -1689,7 +1671,10 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt, if (!pdwEffect) return E_INVALIDARG; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; }

1 0

Andrew Talbot : usbd.sys: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: ec128b732482356fb640e25d88dd1ed482524008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec128b732482356fb640e25d8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:05 2013 +0000 usbd.sys: Avoid signed-unsigned integer comparisons. --- dlls/usbd.sys/usbd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 485a24c..ff0362c 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -105,7 +105,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx( interfaceInfo = &urb->u.UrbSelectConfiguration.Interface; for (interfaceEntry = InterfaceList; interfaceEntry->InterfaceDescriptor; interfaceEntry++) { - int i; + ULONG i; USB_INTERFACE_DESCRIPTOR *currentInterface; USB_ENDPOINT_DESCRIPTOR *endpointDescriptor; interfaceInfo->InterfaceNumber = interfaceEntry->InterfaceDescriptor->bInterfaceNumber;

1 0

Michael Stefaniuc : shell32: Move IFSFolder_Constructor() to avoid forward declarations.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 8a40df9800f874b5dc1fee45f3da133e06a5c8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a40df9800f874b5dc1fee45f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:36:58 2013 +0100 shell32: Move IFSFolder_Constructor() to avoid forward declarations. --- dlls/shell32/shfldr_fs.c | 74 ++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index a88961c..6730733 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -78,11 +78,6 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl pfvt; -static const IDropTargetVtbl dtvt; -static const ISFHelperVtbl shvt; - static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); @@ -199,45 +194,6 @@ static const shvheader GenericSFHeader[] = { #define GENERICSHELLVIEWCOLUMNS 5 /************************************************************************** -* IFSFolder_Constructor -* -* NOTES -* creating undocumented ShellFS_Folder as part of an aggregation -* {F3364BA0-65B9-11CE-A9BA-00AA004AE837} -* -*/ -HRESULT WINAPI -IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IGenericSFImpl *sf; - - TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); - - if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) - return CLASS_E_NOAGGREGATION; - sf = LocalAlloc (LMEM_ZEROINIT, sizeof (IGenericSFImpl)); - if (!sf) - return E_OUTOFMEMORY; - - sf->ref = 0; - sf->IUnknown_inner.lpVtbl = &unkvt; - sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->IDropTarget_iface.lpVtbl = &dtvt; - sf->ISFHelper_iface.lpVtbl = &shvt; - sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - - if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { - IUnknown_Release(&sf->IUnknown_inner); - return E_NOINTERFACE; - } - - TRACE ("--%p\n", *ppv); - return S_OK; -} - -/************************************************************************** * IShellFolder_fnQueryInterface */ static HRESULT WINAPI IShellFolder_fnQueryInterface(IShellFolder2 *iface, REFIID riid, @@ -1689,3 +1645,33 @@ static const IDropTargetVtbl dtvt = { ISFDropTarget_DragLeave, ISFDropTarget_Drop }; + +HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) +{ + IGenericSFImpl *sf; + HRESULT hr; + + TRACE("outer_unk=%p %s\n", outer_unk, shdebugstr_guid(riid)); + + if (outer_unk && !IsEqualIID(riid, &IID_IUnknown)) + return CLASS_E_NOAGGREGATION; + + sf = LocalAlloc(LMEM_ZEROINIT, sizeof(*sf)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->IUnknown_inner.lpVtbl = &unkvt; + sf->IShellFolder2_iface.lpVtbl = &sfvt; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; + sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; + sf->outer_unk = outer_unk ? outer_unk : &sf->IUnknown_inner; + + hr = IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv); + IUnknown_Release(&sf->IUnknown_inner); + + TRACE ("--%p\n", *ppv); + return hr; +}

1 0

Michael Stefaniuc : shell32: COM clean up for IPersistFolder3 in ShellFSFolder.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 90d88de2bfda806ce4d84cbec94d179ee2bc9211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d88de2bfda806ce4d84cbec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:33:53 2013 +0100 shell32: COM clean up for IPersistFolder3 in ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0d52156..f52c192 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -62,7 +62,7 @@ typedef struct { IUnknown IUnknown_inner; LONG ref; IShellFolder2 IShellFolder2_iface; - const IPersistFolder3Vtbl *lpvtblPersistFolder3; + IPersistFolder3 IPersistFolder3_iface; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; IUnknown *outer_unk; @@ -79,7 +79,7 @@ typedef struct { } IGenericSFImpl; static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ +static const IPersistFolder3Vtbl pfvt; static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; @@ -93,9 +93,9 @@ static inline IGenericSFImpl *impl_from_IShellFolder2(IShellFolder2 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IShellFolder2_iface); } -static inline IGenericSFImpl *impl_from_IPersistFolder3( IPersistFolder3 *iface ) +static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblPersistFolder3)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) @@ -112,10 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IPersist_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder3_(This) (&(This)->lpvtblPersistFolder3) #define _IDropTarget_(This) (&(This)->lpvtblDropTarget) #define _ISFHelper_(This) (&(This)->lpvtblSFHelper) @@ -146,14 +142,9 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo *ppvObj = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2)) *ppvObj = &This->IShellFolder2_iface; - else if (IsEqualIID (riid, &IID_IPersist)) - *ppvObj = _IPersist_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder)) - *ppvObj = _IPersistFolder_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder2)) - *ppvObj = _IPersistFolder2_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder3)) - *ppvObj = _IPersistFolder3_ (This); + else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IPersistFolder) || + IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) + *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) *ppvObj = _ISFHelper_ (This); else if (IsEqualIID (riid, &IID_IDropTarget)) { @@ -238,7 +229,7 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->ref = 0; sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; @@ -1427,28 +1418,22 @@ static const ISFHelperVtbl shvt = * IFSFldr_PersistFolder3_QueryInterface * */ -static HRESULT WINAPI -IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, - LPVOID * ppvObj) +static HRESULT WINAPI IFSFldr_PersistFolder3_QueryInterface(IPersistFolder3 *iface, REFIID iid, + void **ppv) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppv); } /************************************************************************ * IFSFldr_PersistFolder3_AddRef * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_AddRef(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } @@ -1456,13 +1441,10 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) * IFSFldr_PersistFolder3_Release * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_Release(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release(This->outer_unk); } @@ -1615,7 +1597,7 @@ IFSFldr_PersistFolder3_GetFolderTargetInfo (IPersistFolder3 * iface, return E_NOTIMPL; } -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3 = +static const IPersistFolder3Vtbl pfvt = { IFSFldr_PersistFolder3_QueryInterface, IFSFldr_PersistFolder3_AddRef,

1 0

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

Feb. 27, 2013

Module: wine Branch: master Commit: bc1a457b1ce4da8ffb0204cf4e3543a9483aa945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1a457b1ce4da8ffb0204cf4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:03 2013 +0000 urlmon: Avoid signed-unsigned integer comparisons. --- dlls/urlmon/uri.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 90113f2..42cfe71 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -891,7 +891,7 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Means we just passed the elision and need to add its values to * 'number' before we do anything else. */ - DWORD j = 0; + INT j; for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; @@ -904,7 +904,8 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Case when the elision appears after the h16 components. */ if(!already_passed_elision && address->elision) { - for(i = 0; i < address->elision_size; i+=2) + INT j; + for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; }

1 0

Huw Davies : riched20: Allow the cursor offset to be equal to the run length - this implies the cursor is at the end of the run , which isn't necessarily the start of the next.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: c5c4d54905b60e44cc1221e51a3d5a07450ebac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c4d54905b60e44cc1221e51… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:50 2013 +0000 riched20: Allow the cursor offset to be equal to the run length - this implies the cursor is at the end of the run, which isn't necessarily the start of the next. --- dlls/riched20/caret.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 82b8e1d..849e500 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -884,14 +884,10 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, } if (x >= run_x && x < run_x+width) { - int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); - if (ch < pNext->member.run.len) - { - cursor->nOffset = ch; - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return TRUE; - } + cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return TRUE; } pLastRun = pNext; pNext = ME_FindItemFwd(pNext, diRunOrStartRow);

1 0

Nikolay Sivov : wshom: Implement IWshShell3::Run().
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 5db4741d0b074ca0080adf36c3fdb440bf92f8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db4741d0b074ca0080adf36c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 10:48:00 2013 +0400 wshom: Implement IWshShell3::Run(). --- dlls/wshom.ocx/shell.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-- include/shellapi.h | 1 + 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1973e2d..bc6a839 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -19,6 +19,7 @@ #include "wshom_private.h" #include "wshom.h" +#include "shellapi.h" #include "shlobj.h" #include "wine/debug.h" @@ -665,10 +666,62 @@ static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type return E_NOTIMPL; } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) { - FIXME("(%s %s %p): stub\n", debugstr_variant(WindowStyle), debugstr_variant(WaitOnReturn), out_ExitCode); - return E_NOTIMPL; + SHELLEXECUTEINFOW info; + int waitforprocess; + VARIANT s, w; + HRESULT hr; + + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + + VariantInit(&s); + hr = VariantChangeType(&s, style, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert style argument, 0x%08x\n", hr); + return hr; + } + + VariantInit(&w); + hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert wait argument, 0x%08x\n", hr); + return hr; + } + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + + waitforprocess = V_I4(&w); + + info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; + info.lpFile = cmd; + info.nShow = V_I4(&s); + + if (!ShellExecuteExW(&info)) + { + TRACE("ShellExecute failed, %d\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + else + { + if (waitforprocess) + { + if (exit_code) + { + DWORD code; + GetExitCodeProcess(info.hProcess, &code); + *exit_code = code; + } + CloseHandle(info.hProcess); + } + else + if (exit_code) *exit_code = 0; + + return S_OK; + } } static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) diff --git a/include/shellapi.h b/include/shellapi.h index d2b4081..acc345d 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -273,6 +273,7 @@ HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT); #define SE_ERR_DDEBUSY 30 #define SE_ERR_NOASSOC 31 +#define SEE_MASK_DEFAULT 0x00000000 #define SEE_MASK_CLASSNAME 0x00000001 #define SEE_MASK_CLASSKEY 0x00000003 #define SEE_MASK_IDLIST 0x00000004

1 0

Piotr Caban : hlink: Added basic Hlink::Navigate tests.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 0159558560e6823f1390e1a62febc161ebebaac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0159558560e6823f1390e1a62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:21:31 2013 +0100 hlink: Added basic Hlink::Navigate tests. --- dlls/hlink/tests/hlink.c | 303 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 298 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0159558560e6823f1390e…

1 0

Ričardas Barkauskas : wined3d: Make shader buffer dynamic.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: cf12f51b1520546dc855e8e8e43135a06e7a0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf12f51b1520546dc855e8e8e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Feb 25 22:49:38 2013 +0200 wined3d: Make shader buffer dynamic. --- dlls/wined3d/shader.c | 28 +++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0616f0a..6444896 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -251,6 +251,7 @@ BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) ERR("Failed to allocate shader buffer memory.\n"); return FALSE; } + buffer->buffer_size = SHADER_PGMSIZE; shader_buffer_clear(buffer); return TRUE; @@ -265,15 +266,28 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va { char *base = buffer->buffer + buffer->content_size; int rc; + char *new_buffer; - rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->content_size, format, args); - - if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->content_size /* C99 */) + while(1) { - ERR("The buffer allocated for the shader program string " - "is too small at %d bytes.\n", SHADER_PGMSIZE); - buffer->content_size = SHADER_PGMSIZE - 1; - return -1; + rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); + if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) + { + new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); + if (!new_buffer) + { + ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); + buffer->content_size = buffer->buffer_size - 1; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; + base = buffer->buffer + buffer->content_size; + } + else + { + break; + } } if (buffer->newline) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e9a3a9..b81e018 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -402,11 +402,12 @@ enum wined3d_shader_rel_op * Shader model 3 according to msdn (and for software shaders) */ #define MAX_LABELS 16 -#define SHADER_PGMSIZE 65535 +#define SHADER_PGMSIZE 16384 struct wined3d_shader_buffer { char *buffer; + unsigned int buffer_size; unsigned int content_size; unsigned int lineNo; BOOL newline;

1 0

Piotr Caban : hlink: Return value returned by IHlinkTarget_Navigate in IHlink_fnNavigate.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: e0b7aadb92f98f95982244487f5e9fc8ea5d4359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b7aadb92f98f95982244487… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:20:56 2013 +0100 hlink: Return value returned by IHlinkTarget_Navigate in IHlink_fnNavigate. --- dlls/hlink/link.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 1957cb0..6f4ac12 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -503,7 +503,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (r == S_OK) { IHlinkTarget_SetBrowseContext(target, phbc); - IHlinkTarget_Navigate(target, grfHLNF, This->Location); + r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); IHlinkTarget_Release(target); } else

1 0

Jacek Caban : wininet: Moved dialog-related functions to dialog.c.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 8ca611a598ea63697ea9b890c0bd4ccdb55529eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca611a598ea63697ea9b890c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 15:43:44 2013 +0100 wininet: Moved dialog-related functions to dialog.c. --- dlls/wininet/dialogs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/http.c | 46 ---------------------------------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 418610d..4acda13 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -37,6 +37,7 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "cryptuiapi.h" #include "internet.h" @@ -560,3 +561,48 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, WININET_Release(&req->hdr); return res; } + +/*********************************************************************** + * InternetShowSecurityInfoByURLA (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) +{ + FIXME("stub: %s %p\n", url, window); + return FALSE; +} + +/*********************************************************************** + * InternetShowSecurityInfoByURLW (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) +{ + FIXME("stub: %s %p\n", debugstr_w(url), window); + return FALSE; +} + +/*********************************************************************** + * ShowX509EncodedCertificate (@) + */ +DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) +{ + PCCERT_CONTEXT certContext = CertCreateCertificateContext(X509_ASN_ENCODING, + cert, len); + DWORD ret; + + if (certContext) + { + CRYPTUI_VIEWCERTIFICATE_STRUCTW view; + + memset(&view, 0, sizeof(view)); + view.hwndParent = parent; + view.pCertContext = certContext; + if (CryptUIDlgViewCertificateW(&view, NULL)) + ret = ERROR_SUCCESS; + else + ret = GetLastError(); + CertFreeCertificateContext(certContext); + } + else + ret = GetLastError(); + return ret; +} diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bbbfe97..861288d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -66,7 +66,6 @@ #include "sspi.h" #include "wincrypt.h" #include "winuser.h" -#include "cryptuiapi.h" #include "internet.h" #include "wine/debug.h" @@ -6112,48 +6111,3 @@ BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length) FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); return FALSE; } - -/*********************************************************************** - * InternetShowSecurityInfoByURLA (@) - */ -BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) -{ - FIXME("stub: %s %p\n", url, window); - return FALSE; -} - -/*********************************************************************** - * InternetShowSecurityInfoByURLW (@) - */ -BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) -{ - FIXME("stub: %s %p\n", debugstr_w(url), window); - return FALSE; -} - -/*********************************************************************** - * ShowX509EncodedCertificate (@) - */ -DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) -{ - PCCERT_CONTEXT certContext = CertCreateCertificateContext(X509_ASN_ENCODING, - cert, len); - DWORD ret; - - if (certContext) - { - CRYPTUI_VIEWCERTIFICATE_STRUCTW view; - - memset(&view, 0, sizeof(view)); - view.hwndParent = parent; - view.pCertContext = certContext; - if (CryptUIDlgViewCertificateW(&view, NULL)) - ret = ERROR_SUCCESS; - else - ret = GetLastError(); - CertFreeCertificateContext(certContext); - } - else - ret = GetLastError(); - return ret; -}

1 0

Jacek Caban : wininet: Don' t call get_avail_data multiple times in HTTP_ReceiveRequestData.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 376a4f7837c3f50c49ea0704524db13449f9ccbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=376a4f7837c3f50c49ea07045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 15:43:34 2013 +0100 wininet: Don't call get_avail_data multiple times in HTTP_ReceiveRequestData. --- dlls/wininet/http.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 81439ca..bbbfe97 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2774,10 +2774,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD mode = first_notif && req->read_size ? READMODE_NOBLOCK : READMODE_ASYNC; res = refill_read_buffer(req, mode, &read); - if(res == ERROR_SUCCESS && !first_notif) + if(res == ERROR_SUCCESS) avail = get_avail_data(req); - if(ret_size) - *ret_size = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2786,10 +2784,17 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD http_release_netconn(req, FALSE); } - if(res == ERROR_SUCCESS) - send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); - else + if(res != ERROR_SUCCESS) { send_request_complete(req, 0, res); + return; + } + + if(ret_size) + *ret_size = avail; + if(first_notif) + avail = 0; + + send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); } /* read data from the http connection (the read section must be held) */

1 0

Jacek Caban : msctf.idl: Added some missing declarations.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 99421e8c1dff5fdad4b00a68dea33f848e0994ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=99421e8c1dff5fdad4b00a68d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 14:53:05 2013 +0100 msctf.idl: Added some missing declarations. --- include/msctf.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 2ed3866..a1a6f17 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -79,6 +79,9 @@ cpp_quote("#define TF_MOD_LSHIFT 0x0100") cpp_quote("#define TF_MOD_ON_KEYUP 0x0200") cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") +cpp_quote("#define TF_PROFILETYPE_INPUTPROCESSOR 0x0001") +cpp_quote("#define TF_PROFILETYPE_KEYBOARDLAYOUT 0x0002") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs; @@ -99,6 +102,10 @@ interface ITfEditRecord; interface ITfCompositionView; interface ITfKeyEventSink; +cpp_quote("#if 0") +typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; +cpp_quote("#endif") + typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { CLSID clsid; @@ -421,6 +428,105 @@ interface ITfInputProcessorProfiles : IUnknown [in] HKL hKL); }; +typedef [uuid(44d2825a-10e5-43b2-877f-6cb2f43b7e7e)] +struct TF_INPUTPROCESSORPROFILE { + DWORD dwProfileType; + LANGID langid; + CLSID clsid; + GUID guidProfile; + GUID catid; + HKL hklSubstitute; + DWORD dwCaps; + HKL hkl; + DWORD dwFlags; +} TF_INPUTPROCESSORPROFILE; + +[ + object, + uuid(71c6e74d-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface IEnumTfInputProcessorProfiles : IUnknown +{ + HRESULT Clone( + [out] IEnumTfInputProcessorProfiles **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetch)] TF_INPUTPROCESSORPROFILE *pProfile, + [out] ULONG *pcFetch); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(71c6e74c-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface ITfInputProcessorProfileMgr : IUnknown +{ + HRESULT ActivateProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); + + HRESULT DeactivateProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); + + HRESULT GetProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [out] TF_INPUTPROCESSORPROFILE *pProfile); + + + HRESULT EnumProfiles( + [in] LANGID langid, + [out] IEnumTfInputProcessorProfiles **ppEnum); + + HRESULT ReleaseInputProcessor( + [in] REFCLSID rclsid, + [in] DWORD dwFlags); + + HRESULT RegisterProfile( + [in] REFCLSID rclsid, + [in] LANGID langid, + [in] REFGUID guidProfile, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc, + [in, size_is(cchFile)] const WCHAR *pchIconFile, + [in] ULONG cchFile, + [in] ULONG uIconIndex, + [in] HKL hklsubstitute, + [in] DWORD dwPreferredLayout, + [in] BOOL bEnabledByDefault, + [in] DWORD dwFlags); + + HRESULT UnregisterProfile( + [in] REFCLSID rclsid, + [in] LANGID langid, + [in] REFGUID guidProfile, + [in] DWORD dwFlags); + + HRESULT GetActiveProfile( + [in] REFGUID catid, + [out] TF_INPUTPROCESSORPROFILE *pProfile); +} + typedef [uuid(c4cc07f1-80cc-4a7b-bc54-98512782cbe3)] enum { TF_LS_NONE = 0,

1 0

Jacek Caban : widl: Allow shadowing imported types with typedef.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: ed50ce5efe04b65c0fe5648d2c8622b493b074fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed50ce5efe04b65c0fe5648d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 14:52:54 2013 +0100 widl: Allow shadowing imported types with typedef. --- tools/widl/parser.y | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d8435b9..b7fa2f6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1868,7 +1868,17 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at var_t *name; cur = find_type(decl->var->name, 0); - if (cur) + + /* + * MIDL allows shadowing types that are declared in imported files. + * We don't throw an error in this case and instead add a new type + * (which is earlier on the list in hash table, so it will be used + * instead of shadowed type). + * + * FIXME: We may consider string separated type tables for each input + * for cleaner solution. + */ + if (cur && input_name == cur->loc_info.input_name) error_loc("%s: redefinition error; original definition was at %s:%d\n", cur->name, cur->loc_info.input_name, cur->loc_info.line_number);

1 0

Huw Davies : riched20: Don' t assume the the runs in a row are in visual order.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 5e5301273674c0c118aee70c44e553b9f1712d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5301273674c0c118aee70c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:51 2013 +0000 riched20: Don't assume the the runs in a row are in visual order. --- dlls/riched20/caret.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 849e500..b41ee9e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -869,6 +869,14 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, int x, ME_Cursor *cursor, int *pbCaretAtEnd) { ME_DisplayItem *pNext, *pLastRun; + ME_Row *row = &pRow->member.row; + BOOL exact = TRUE; + + if (x < row->pt.x) + { + x = row->pt.x; + exact = FALSE; + } pNext = ME_FindItemFwd(pRow, diRunOrStartRow); assert(pNext->type == diRun); if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; @@ -876,18 +884,13 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, do { int run_x = pNext->member.run.pt.x; int width = pNext->member.run.nWidth; - if (x < run_x) - { - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; - } + if (x >= run_x && x < run_x+width) { cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); cursor->pRun = pNext; cursor->pPara = ME_GetParagraph( cursor->pRun ); - return TRUE; + return exact; } pLastRun = pNext; pNext = ME_FindItemFwd(pNext, diRunOrStartRow);

1 0

Huw Davies : riched20: Correctly set the row's x position.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: e68e6ff740211eb9cff1693b1384c7dd979e03bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68e6ff740211eb9cff1693b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:49 2013 +0000 riched20: Correctly set the row's x position. --- dlls/riched20/wrap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 7c34876..9bebd8a 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -233,6 +233,7 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT) shift = max(wc->nAvailWidth-width, 0); + row->member.row.pt.x = row->member.row.nLMargin + shift; for (p = wc->pRowStart; p!=pEnd; p = p->next) { if (p->type==diRun) { /* FIXME add more run types */

1 0