February 2014 - Wine-commits

Michael Stefaniuc : qedit: Use the generic BaseFilter implementation in SampleGrabber.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 147cf6cc4ecfc860017c4699ee85c7cb19515a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147cf6cc4ecfc860017c4699e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 20 00:13:09 2014 +0100 qedit: Use the generic BaseFilter implementation in SampleGrabber. --- dlls/qedit/Makefile.in | 2 +- dlls/qedit/samplegrabber.c | 157 +++++++++++--------------------------------- 2 files changed, 39 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=147cf6cc4ecfc860017c4…

1 0

Aric Stewart : winemac.drv: Improve positioning of IME client window based on caret.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: eb19c39126f8ea6cad7aa5165adbfd16a5a8b1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb19c39126f8ea6cad7aa5165… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 20 15:28:33 2014 +0900 winemac.drv: Improve positioning of IME client window based on caret. --- dlls/winemac.drv/ime.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 2c74f6e..3a2a78b 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1581,17 +1581,12 @@ BOOL query_ime_char_rect(macdrv_query* query) if (!ret) { - HWND focus = GetFocus(); - if (focus && (focus == hwnd || IsChild(hwnd, focus)) && - GetClientRect(focus, &charpos.rcDocument)) + GUITHREADINFO gti; + gti.cbSize = sizeof(gti); + if (GetGUIThreadInfo(0, &gti)) { - if (!GetCaretPos((POINT*)&charpos.rcDocument)) - charpos.rcDocument.left = charpos.rcDocument.top = 0; - - charpos.rcDocument.right = charpos.rcDocument.left + 1; - MapWindowPoints(focus, 0, (POINT*)&charpos.rcDocument, 2); - - *rect = cgrect_from_rect(charpos.rcDocument); + MapWindowPoints(gti.hwndCaret, 0, (POINT*)&gti.rcCaret, 2); + *rect = cgrect_from_rect(gti.rcCaret); ret = TRUE; } }

1 0

Nikolay Sivov : ole32/tests: Handle context generation failure better.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: ffcced0f3906534e6765730d44d8e9d82bbf864e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcced0f3906534e6765730d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 12:59:34 2014 +0400 ole32/tests: Handle context generation failure better. --- dlls/ole32/tests/compobj.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c96dfe0..b85842b 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -192,7 +192,13 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) actctx.lpSource = path; handle = pCreateActCtxW(&actctx); - ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE || broken(handle == INVALID_HANDLE_VALUE) /* some old XP/2k3 versions */, + "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + if (handle == INVALID_HANDLE_VALUE) + { + win_skip("activation context generation failed, some tests will be skipped\n"); + handle = NULL; + } ok(actctx.cbSize == sizeof(ACTCTXW), "actctx.cbSize=%d\n", actctx.cbSize); ok(actctx.dwFlags == 0, "actctx.dwFlags=%d\n", actctx.dwFlags); @@ -206,8 +212,11 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) DeleteFileA("file.manifest"); - ret = pActivateActCtx(handle, cookie); - ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + if (handle) + { + ret = pActivateActCtx(handle, cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + } return handle; }

1 0

Dmitry Timoshkov : taskschd: Add IRegistrationInfo stub implementation.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 257a3bb17c41ef46d466014063c764380f5ae29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=257a3bb17c41ef46d46601406… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:12:51 2014 +0900 taskschd: Add IRegistrationInfo stub implementation. --- dlls/taskschd/task.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index c0b8141..d51e4ae 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -35,6 +35,237 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); typedef struct { + IRegistrationInfo IRegistrationInfo_iface; + LONG ref; +} registration_info; + +static inline registration_info *impl_from_IRegistrationInfo(IRegistrationInfo *iface) +{ + return CONTAINING_RECORD(iface, registration_info, IRegistrationInfo_iface); +} + +static ULONG WINAPI RegistrationInfo_AddRef(IRegistrationInfo *iface) +{ + registration_info *reginfo = impl_from_IRegistrationInfo(iface); + return InterlockedIncrement(&reginfo->ref); +} + +static ULONG WINAPI RegistrationInfo_Release(IRegistrationInfo *iface) +{ + registration_info *reginfo = impl_from_IRegistrationInfo(iface); + LONG ref = InterlockedDecrement(&reginfo->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(reginfo); + } + + return ref; +} + +static HRESULT WINAPI RegistrationInfo_QueryInterface(IRegistrationInfo *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IRegistrationInfo) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IRegistrationInfo_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI RegistrationInfo_GetTypeInfoCount(IRegistrationInfo *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_GetTypeInfo(IRegistrationInfo *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_GetIDsOfNames(IRegistrationInfo *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_Invoke(IRegistrationInfo *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, BSTR *description) +{ + FIXME("%p,%p: stub\n", iface, description); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, BSTR description) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(description)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR *author) +{ + FIXME("%p,%p: stub\n", iface, author); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR author) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(author)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BSTR *version) +{ + FIXME("%p,%p: stub\n", iface, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Version(IRegistrationInfo *iface, BSTR version) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(version)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR *date) +{ + FIXME("%p,%p: stub\n", iface, date); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Date(IRegistrationInfo *iface, BSTR date) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(date)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *iface, BSTR *doc) +{ + FIXME("%p,%p: stub\n", iface, doc); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Documentation(IRegistrationInfo *iface, BSTR doc) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(doc)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_XmlText(IRegistrationInfo *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_XmlText(IRegistrationInfo *iface, BSTR xml) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(xml)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *uri) +{ + FIXME("%p,%p: stub\n", iface, uri); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_URI(IRegistrationInfo *iface, BSTR uri) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(uri)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo *iface, VARIANT *sddl) +{ + FIXME("%p,%p: stub\n", iface, sddl); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_SecurityDescriptor(IRegistrationInfo *iface, VARIANT sddl) +{ + FIXME("%p,%p: stub\n", iface, debugstr_variant(&sddl)); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR *source) +{ + FIXME("%p,%p: stub\n", iface, source); + return E_NOTIMPL; +} + +static HRESULT WINAPI RegistrationInfo_put_Source(IRegistrationInfo *iface, BSTR source) +{ + FIXME("%p,%p: stub\n", iface, debugstr_w(source)); + return E_NOTIMPL; +} + +static const IRegistrationInfoVtbl RegistrationInfo_vtbl = +{ + RegistrationInfo_QueryInterface, + RegistrationInfo_AddRef, + RegistrationInfo_Release, + RegistrationInfo_GetTypeInfoCount, + RegistrationInfo_GetTypeInfo, + RegistrationInfo_GetIDsOfNames, + RegistrationInfo_Invoke, + RegistrationInfo_get_Description, + RegistrationInfo_put_Description, + RegistrationInfo_get_Author, + RegistrationInfo_put_Author, + RegistrationInfo_get_Version, + RegistrationInfo_put_Version, + RegistrationInfo_get_Date, + RegistrationInfo_put_Date, + RegistrationInfo_get_Documentation, + RegistrationInfo_put_Documentation, + RegistrationInfo_get_XmlText, + RegistrationInfo_put_XmlText, + RegistrationInfo_get_URI, + RegistrationInfo_put_URI, + RegistrationInfo_get_SecurityDescriptor, + RegistrationInfo_put_SecurityDescriptor, + RegistrationInfo_get_Source, + RegistrationInfo_put_Source +}; + +HRESULT RegistrationInfo_create(IRegistrationInfo **obj) +{ + registration_info *reginfo; + + reginfo = heap_alloc_zero(sizeof(*reginfo)); + if (!reginfo) return E_OUTOFMEMORY; + + reginfo->IRegistrationInfo_iface.lpVtbl = &RegistrationInfo_vtbl; + reginfo->ref = 1; + *obj = &reginfo->IRegistrationInfo_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskSettings ITaskSettings_iface; LONG ref; WCHAR *restart_interval;

1 0

Frédéric Delanoy : Fix spelling in WWN 363
by Jeremy Newman 20 Feb '14

20 Feb '14

Module: website Branch: master Commit: 1ce0abdfe3efd2fd9e72d563eaf1be94119a2111 URL: http://source.winehq.org/git/website.git/?a=commit;h=1ce0abdfe3efd2fd9e72d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 18 18:17:21 2014 +0100 Fix spelling in WWN 363 --- news/en/2014021401.xml | 2 +- wwn/en/wn20140214_363.xml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/news/en/2014021401.xml b/news/en/2014021401.xml index cb6633b..2181e59 100644 --- a/news/en/2014021401.xml +++ b/news/en/2014021401.xml @@ -7,7 +7,7 @@ <li><a href="{$root}/wwn/363#WWN revived?">WWN revived?</a></li> <li><a href="{$root}/wwn/363#Wine at LinuxTag in Berlin">Wine at LinuxTag in Berlin</a></li> <li><a href="{$root}/wwn/363#FOSDEM 2014">FOSDEM 2014</a></li> -<li><a href="{$root}/wwn/363#AppDB/BugZilla Status Changes">AppDB/BugZilla Status Changes</a></li> +<li><a href="{$root}/wwn/363#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> </ul> </body> </news> diff --git a/wwn/en/wn20140214_363.xml b/wwn/en/wn20140214_363.xml index 3ebea70..aa147db 100644 --- a/wwn/en/wn20140214_363.xml +++ b/wwn/en/wn20140214_363.xml @@ -29,15 +29,15 @@ Its main goal is to fool you into thinking there's going to be issues written re > <topic></topic> -Hi, my name is André Hentschel, a Wine developer. I guess i'm mostly know for my <a href="http://wiki.winehq.org/ARM">Wine on ARM work</a>, -but this time i'll try to revive WWN for you. As i'm not a native speaker, enjoy my typos :) +Hi, my name is André Hentschel, a Wine developer. I guess I'm mostly known for my <a href="http://wiki.winehq.org/ARM">Wine on ARM work</a>, +but this time I'll try to revive WWN for you. As I'm not a native speaker, enjoy my typos :) -WWN started in 1999 as Wine's kernel cousin publication and is also known as Wine Weekly News or more realistic World Wine News. +WWN started in 1999 as Wine's kernel cousin publication and is also known as Wine Weekly News or more realisticallly World Wine News. It has long been driven by Zachary Goldberg, but stalled nearly four years ago. -I can't present many news this time, mostly because i'm not a journalist and thus need the help from others to gather topics around Wine to report. +I can't present many news this time, mostly because I'm not a journalist and thus need the help from others to gather topics around Wine to report. At best they already come with some more text than just the headline and are posted to <a href="http://wiki.winehq.org/RecentNewsQueue">RecentNewsQueue in our Wiki</a>, which is totally out of date. @@ -68,7 +68,7 @@ We're open to other talk proposals. Please don't hesitate to reply if you're int </quote> -Maybe there'll also be a Wine booth, but it obviously needs more resources than a talk does. +Maybe there will also be a Wine booth, but it obviously needs more resources than a talk does. </section> @@ -84,7 +84,7 @@ We enjoyed a great FOSDEM this year again and one big change compared to last ye nearly all talks were recorded, including the Wine ones. The videos are already available at <a href="http://video.fosdem.org/2014/AW1120/Sunday/">video.fosdem.org/2014/AW1120/Sunday/</a>, but they lack sound at the time of writing. The cause is that the videos only contain the right audio channel -and we choosed the left one for the microphone. We depend on the FOSDEM volunteers to do the reencoding for us, +and we chose the left one for the microphone. We depend on the FOSDEM volunteers to do the re-encoding for us, so be patient, they have a lot to do and are doing a great job. @@ -92,23 +92,23 @@ More Problems: <quote> <ul> -<li>We only got the master recording laptop around 9:10, so Alexandres keynote is mostly lost in time and space.</li> +<li>We only got the master recording laptop around 9:10, so Alexandre's keynote is mostly lost in time and space.</li> <li>I failed to select the +48V switch in fear of blowing up the microphone. So sound arrived at 42:20 in the Pipelight Talk after the audio angel helped us.</li> -<li>The presenter laptop->slave laptop firewire cable was broken, so it only started working for Rosannes talk. (Its also the reason her talk is cut into various pieces as we rebooted the machines inbetween.)</li> -<li>Talks after Rosannes are good.</li> +<li>The presenter laptop->slave laptop FireWire cable was broken, so it only started working for Rosanne's talk (it's also the reason her talk is cut into various pieces as we rebooted the machines in between).</li> +<li>Talks after Rosanne's are good.</li> <li>As there were no BOF topics, the recording slot is empty.</li> </ul> </quote> </section> <section - title="AppDB/BugZilla Status Changes" - subject="AppDB/BugZilla" + title="AppDB/Bugzilla Status Changes" + subject="AppDB/Bugzilla" archive="//appdb.winehq.org" posts="0" > -<topic>AppDB / BugZilla</topic> -<center>BugZilla Changes (last two weeks):</center> +<topic>AppDB / Bugzilla</topic> +<center>Bugzilla Changes (last two weeks):</center> <center> <table border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> @@ -198,7 +198,7 @@ More Problems: <center>AppDB Application Status Changes (last two weeks)</center> Since last WWN from 2010, there was a total change of +392, thanks to updates by App Maintainers, -and +198, thanks to updates by the Public. Both across more than 5600 Applications! That's the main reason i'm not +and +198, thanks to updates by the Public. Both across more than 5600 Applications! That's the main reason I'm not listing this huge period of time here. *Disclaimer: These lists of changes are automatically generated by information entered into the AppDB. These results are subject to the opinions of the users submitting application reviews.

1 0

Nikolay Sivov : oleaut32: No need to VariantClear() before VariantCopy().
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 6f30f699cc7da0f9e1227bc316711f3d3fa2d6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f30f699cc7da0f9e1227bc31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 19 18:51:34 2014 +0400 oleaut32: No need to VariantClear() before VariantCopy(). --- dlls/oleaut32/safearray.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 436a2ca..b7d8b37 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -884,8 +884,6 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData VARIANT* lpVariant = pvData; VARIANT* lpDest = lpvDest; - hRet = VariantClear(lpDest); - if (FAILED(hRet)) FIXME("VariantClear failed with 0x%x\n", hRet); hRet = VariantCopy(lpDest, lpVariant); if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); }

1 0

Dmitry Timoshkov : shlwapi: Return interface instead of implementation pointer.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 968d464f17b5a8b87a1a5e3d988e39dfc6d7cf7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=968d464f17b5a8b87a1a5e3d9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 17 14:48:31 2014 +0900 shlwapi: Return interface instead of implementation pointer. --- dlls/shlwapi/istream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 044594b..7d502a2 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -73,8 +73,8 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) { - *ppvObj = This; IStream_AddRef(iface); + *ppvObj = iface; return S_OK; } return E_NOINTERFACE;

1 0

Dmitry Timoshkov : shlwapi: Avoid potential NULL pointer access if HeapAlloc fails.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 35a9587613f391f772ce027ac93dabba1190a791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a9587613f391f772ce027ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 17 14:48:35 2014 +0900 shlwapi: Avoid potential NULL pointer access if HeapAlloc fails. --- dlls/shlwapi/istream.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 7d502a2..2e365d6 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -364,22 +364,21 @@ static const IStreamVtbl SHLWAPI_fsVTable = */ static IStream *IStream_Create(LPCWSTR lpszPath, HANDLE hFile, DWORD dwMode) { - ISHFileStream* fileStream; - - fileStream = HeapAlloc(GetProcessHeap(), 0, sizeof(ISHFileStream)); - - if (fileStream) - { - fileStream->IStream_iface.lpVtbl = &SHLWAPI_fsVTable; - fileStream->ref = 1; - fileStream->hFile = hFile; - fileStream->dwMode = dwMode; - fileStream->lpszPath = StrDupW(lpszPath); - fileStream->type = 0; /* FIXME */ - fileStream->grfStateBits = 0; /* FIXME */ - } - TRACE ("Returning %p\n", fileStream); - return &fileStream->IStream_iface; + ISHFileStream *fileStream; + + fileStream = HeapAlloc(GetProcessHeap(), 0, sizeof(ISHFileStream)); + if (!fileStream) return NULL; + + fileStream->IStream_iface.lpVtbl = &SHLWAPI_fsVTable; + fileStream->ref = 1; + fileStream->hFile = hFile; + fileStream->dwMode = dwMode; + fileStream->lpszPath = StrDupW(lpszPath); + fileStream->type = 0; /* FIXME */ + fileStream->grfStateBits = 0; /* FIXME */ + + TRACE ("Returning %p\n", fileStream); + return &fileStream->IStream_iface; } /*************************************************************************

1 0

Dmitry Timoshkov : shlwapi: Avoid a not necessary intermediate variable.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 99eab9d3c78d2c59ebfc0fd046414b5f7c717298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99eab9d3c78d2c59ebfc0fd04… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 17 14:48:39 2014 +0900 shlwapi: Avoid a not necessary intermediate variable. --- dlls/shlwapi/istream.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 2e365d6..bbd331a 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -294,16 +294,14 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion(IStream *iface, ULARGE_INTEGER static HRESULT WINAPI IStream_fnStat(IStream *iface, STATSTG* lpStat, DWORD grfStatFlag) { - ISHFileStream *This = impl_from_IStream(iface); - BY_HANDLE_FILE_INFORMATION fi; - HRESULT hRet = S_OK; + ISHFileStream *This = impl_from_IStream(iface); + BY_HANDLE_FILE_INFORMATION fi; - TRACE("(%p,%p,%d)\n", This, lpStat, grfStatFlag); + TRACE("(%p,%p,%d)\n", This, lpStat, grfStatFlag); + + if (!grfStatFlag) + return STG_E_INVALIDPOINTER; - if (!grfStatFlag) - hRet = STG_E_INVALIDPOINTER; - else - { memset(&fi, 0, sizeof(fi)); GetFileInformationByHandle(This->hFile, &fi); @@ -322,8 +320,8 @@ static HRESULT WINAPI IStream_fnStat(IStream *iface, STATSTG* lpStat, memcpy(&lpStat->clsid, &IID_IStream, sizeof(CLSID)); lpStat->grfStateBits = This->grfStateBits; lpStat->reserved = 0; - } - return hRet; + + return S_OK; } /*************************************************************************

1 0

Jacek Caban : mshtml: Added support for ZoomFactor registry value.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: 92517e2c5ee6067a2a4cc2560679a6842a7ae209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92517e2c5ee6067a2a4cc2560… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 19 17:24:24 2014 +0100 mshtml: Added support for ZoomFactor registry value. --- dlls/mshtml/nsiface.idl | 41 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/oleobj.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ddb6d85..c0959f5 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3703,6 +3703,47 @@ interface nsIDocShell : nsIDocShellTreeItem [ object, + uuid(02d37b31-e654-4b74-9bc3-14dfe0020bb3), + local +] +interface nsIMarkupDocumentViewer : nsISupports +{ + nsresult ScrollToNode(nsIDOMNode *node); + nsresult GetTextZoom(float *aTextZoom); + nsresult SetTextZoom(float aTextZoom); + nsresult GetFullZoom(float *aFullZoom); + nsresult SetFullZoom(float aFullZoom); + nsresult GetAuthorStyleDisabled(bool *aAuthorStyleDisabled); + nsresult SetAuthorStyleDisabled(bool aAuthorStyleDisabled); + nsresult GetDefaultCharacterSet(nsACString *aDefaultCharacterSet); + nsresult SetDefaultCharacterSet(const nsACString *aDefaultCharacterSet); + nsresult GetForceCharacterSet(nsACString *aForceCharacterSet); + nsresult SetForceCharacterSet(const nsACString *aForceCharacterSet); + nsresult GetHintCharacterSet(nsACString *aHintCharacterSet); + nsresult SetHintCharacterSet(const nsACString *aHintCharacterSet); + nsresult GetHintCharacterSetSource(int32_t *aHintCharacterSetSource); + nsresult SetHintCharacterSetSource(int32_t aHintCharacterSetSource); + nsresult GetPrevDocCharacterSet(nsACString *aPrevDocCharacterSet); + nsresult SetPrevDocCharacterSet(const nsACString *aPrevDocCharacterSet); + nsresult GetContentSize(int32_t *width, int32_t *height); + nsresult GetBidiTextDirection(uint8_t *aBidiTextDirection); + nsresult SetBidiTextDirection(uint8_t aBidiTextDirection); + nsresult GetBidiTextType(uint8_t *aBidiTextType); + nsresult SetBidiTextType(uint8_t aBidiTextType); + nsresult GetBidiNumeral(uint8_t *aBidiNumeral); + nsresult SetBidiNumeral(uint8_t aBidiNumeral); + nsresult GetBidiSupport(uint8_t *aBidiSupport); + nsresult SetBidiSupport(uint8_t aBidiSupport); + nsresult GetBidiOptions(uint32_t *aBidiOptions); + nsresult SetBidiOptions(uint32_t aBidiOptions); + nsresult GetMinFontSize(int32_t *aMinFontSize); + nsresult SetMinFontSize(int32_t aMinFontSize); + nsresult AppendSubtree(void /* nsTArray<nsCOMPtr<nsIMarkupDocumentViewer>> */ *array); + nsresult ChangeMaxLineBoxWidth(int32_t maxLineBoxWidth); +} + +[ + object, uuid(16fe5e3e-eadc-4312-9d44-b6bedd6b5474), local ] diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 1a123ac..ea8cea6 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -226,6 +227,52 @@ void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) doc_can_navigate ? &var : NULL, NULL); } +static void load_settings(HTMLDocumentObj *doc) +{ + nsIMarkupDocumentViewer *markup_document_viewer; + nsIContentViewer *content_viewer; + nsIDocShell *doc_shell; + HKEY settings_key; + DWORD val, size; + LONG res; + nsresult nsres; + + static const WCHAR ie_keyW[] = { + 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',0}; + static const WCHAR zoomW[] = {'Z','o','o','m',0}; + static const WCHAR zoom_factorW[] = {'Z','o','o','m','F','a','c','t','o','r',0}; + + res = RegOpenKeyW(HKEY_CURRENT_USER, ie_keyW, &settings_key); + if(res != ERROR_SUCCESS) + return; + + size = sizeof(val); + res = RegGetValueW(settings_key, zoomW, zoom_factorW, RRF_RT_REG_DWORD, NULL, &val, &size); + RegCloseKey(settings_key); + if(res != ERROR_SUCCESS) + return; + + TRACE("Setting ZoomFactor to %u\n", val); + + nsres = get_nsinterface((nsISupports*)doc->nscontainer->navigation, &IID_nsIDocShell, (void**)&doc_shell); + assert(nsres == NS_OK); + + nsres = nsIDocShell_GetContentViewer(doc_shell, &content_viewer); + assert(nsres == NS_OK && content_viewer); + + nsres = nsISupports_QueryInterface(content_viewer, &IID_nsIMarkupDocumentViewer, (void**)&markup_document_viewer); + nsISupports_Release(content_viewer); + assert(nsres == NS_OK); + + nsres = nsIMarkupDocumentViewer_SetFullZoom(markup_document_viewer, (float)val/100000); + if(NS_FAILED(nsres)) + ERR("SetFullZoom failed: %08x\n", nsres); + + nsIDocShell_Release(doc_shell); +} + static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { HTMLDocument *This = impl_from_IOleObject(iface); @@ -319,7 +366,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(hres == S_OK && key_path) { if(key_path[0]) { /* FIXME: use key_path */ - TRACE("key_path = %s\n", debugstr_w(key_path)); + FIXME("key_path = %s\n", debugstr_w(key_path)); } CoTaskMemFree(key_path); } @@ -331,7 +378,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(hres == S_OK && override_key_path && override_key_path[0]) { if(override_key_path[0]) { /*FIXME: use override_key_path */ - TRACE("override_key_path = %s\n", debugstr_w(override_key_path)); + FIXME("override_key_path = %s\n", debugstr_w(override_key_path)); } CoTaskMemFree(override_key_path); } @@ -342,6 +389,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } } + load_settings(This->doc_obj); + /* Native calls here GetWindow. What is it for? * We don't have anything to do with it here (yet). */ hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleWindow, (void**)&ole_window);

1 0