wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Cressida Silver : typo
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 02b027007dd969eac91ec769f380ac506280ba7a URL: https://source.winehq.org/git/website.git/?a=commit;h=02b027007dd969eac91ec… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Oct 29 08:57:22 2021 -0500 typo --- wwn/en/wn20211029_406.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20211029_406.xml b/wwn/en/wn20211029_406.xml index 46d1e9ff..6f8be0d5 100644 --- a/wwn/en/wn20211029_406.xml +++ b/wwn/en/wn20211029_406.xml @@ -74,7 +74,7 @@ <section title="Unicode 14" subject="Unicode 14" archive="https://www.winehq.org/pipermail/wine-devel/2021-September/195389.html" posts="1"> <p> - Nikolay has moved Wine from the boring world of Unicode 13 to the brave new world of Unicode 14. Who wants to live in a world without the melting smiley face or the bitten lower lip? Not us — that’s for sure. When Unicode 14 is rolled out to the interwebs at large, there will be a grand total of characters to 144,697. Of course, Wine requires the underlying system fonts to support the new Unicode characters, which will take some time. + Nikolay has moved Wine from the boring world of Unicode 13 to the brave new world of Unicode 14. Who wants to live in a world without the melting smiley face or the bitten lower lip? Not us — that’s for sure. When Unicode 14 is rolled out to the interwebs at large, there will be a grand total of 144,697 characters. Of course, Wine requires the underlying system fonts to support the new Unicode characters, which will take some time. </p> <p>

1 0

Jeremy Newman : use buttons for nav
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 28c8ef80ede81077d168202a7d414a09043eb41b URL: https://source.winehq.org/git/website.git/?a=commit;h=28c8ef80ede81077d1682… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:37:47 2021 -0500 use buttons for nav --- include/wwn.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wwn.php b/include/wwn.php index 9231be81..6aeb7d35 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -172,22 +172,22 @@ class wwn if ($pos >= $perpage) { $prev = $pos - $perpage; - $prevLink = $html->ahref("<< Prev $perpage Issues", $html->_web_root."/".PAGE."/?pos=".$prev); + $prevLink = $html->ahref("<i class=\"fas fa-chevron-left\"></i> Prev $perpage Issues", $html->_web_root."/".PAGE."/?pos=".$prev, "class=\"btn btn-default\""); } else { - $prevLink = "<span class=\"disabled\"><< Prev $perpage Issues</span>"; + $prevLink = "<span class=\"btn btn-default disabled\"><i class=\"fas fa-chevron-left\"></i> Prev $perpage Issues</span>"; } // display next link if (($pos + $perpage) < $total) { $next = $where + 1; - $nextLink = $html->ahref("Next $perpage Issues >>",$html->_web_root."/".PAGE."/?pos=".$next); + $nextLink = $html->ahref("Next $perpage Issues <i class=\"fas fa-chevron-right\"></i>",$html->_web_root."/".PAGE."/?pos=".$next, "class=\"btn btn-default\""); } else { - $nextLink = "<span class=\"disabled\">Next $perpage Issues >></span>"; + $nextLink = "<span class=\"btn btn-default disabled\">Next $perpage Issues <i class=\"fas fa-chevron-right\"></i></span>"; }

1 0

Jeremy Newman : small layout tweak, icon
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 24930bca23eda7162b43879126631044e1406fe2 URL: https://source.winehq.org/git/website.git/?a=commit;h=24930bca23eda7162b438… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:37:17 2021 -0500 small layout tweak, icon --- templates/en/wwn.template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/en/wwn.template b/templates/en/wwn.template index a6a5ba31..e0dec76d 100644 --- a/templates/en/wwn.template +++ b/templates/en/wwn.template @@ -2,9 +2,8 @@   -<h1 class="title">World Wine News</h1> -<div style="font-size: x-small; margin-top: 0;">All the news that fits, we print.</div> - - +<h1 class="title"><i class="far fa-newspaper"></i> World Wine News</h1> +<p class="margin-bottom-lg">All the news that fits, we print.</p> +

1 0

Jeremy Newman : move wwn link to top, add intro text, icon
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 37d874852c38bfb10281aac39ef79eed1ec71869 URL: https://source.winehq.org/git/website.git/?a=commit;h=37d874852c38bfb10281a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:24:01 2021 -0500 move wwn link to top, add intro text, icon --- templates/en/news.template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/en/news.template b/templates/en/news.template index 719e0727..6c5c125d 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,15 +1,17 @@  -<h1 class="title">News</h1> +<h1 class="title"><i class="far fa-newspaper"></i> News</h1> + +<p class="margin-bottom-lg"> + Latest news in the Wine community.<br> + More news can be found in our + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> +</p>  <hr> <div class="link-container"> - <p> - <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> -   <i class="fas fa-ellipsis-v"></i>   - <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ News RSS Feed</a> - </p> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ News RSS Feed</a> </div>

1 0

Jeremy Newman : add nav link for news, add wwn archive link
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 702015e9559479c7f93129bce2a68fe92ec49046 URL: https://source.winehq.org/git/website.git/?a=commit;h=702015e9559479c7f9312… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:18:30 2021 -0500 add nav link for news, add wwn archive link --- templates/en/home.template | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/en/home.template b/templates/en/home.template index 20212534..5183f1c8 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -111,6 +111,16 @@ </a> <div class="clear"></div> + <a class="winehq_menu_item appdb" href="{$root}/news"> + <span class="winehq_badge fa-4x fa-layers fa-fw"> + <i class="winehq_badge_inner fas fa-square"></i> + <i class="fa-inverse fas fa-newspaper" data-fa-transform="shrink-6"></i> + </span> + <span class="title">News</span> + <span class="subtitle">What is going on lately?</span> + </a> + <div class="clear"></div> + <a class="winehq_menu_item appdb" href="https://appdb.winehq.org"> <span class="winehq_badge fa-4x fa-layers fa-fw"> <i class="winehq_badge_inner fas fa-square"></i> @@ -163,7 +173,11 @@  - <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> more news...</a></p> + <p> + <a href="{$root}/news" class="btn btn-default"><i class="fas fa-chevron-right"></i> News Archive</a> +   + <a href="{$root}/wwn" class="btn btn-default"><i class="fas fa-newspaper"></i> World Wine News</a> + </p> </div>

1 0

Jeremy Newman : fix links
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 6ceffdd1d84fcc94b54b8337316d10c6b2a24bb8 URL: https://source.winehq.org/git/website.git/?a=commit;h=6ceffdd1d84fcc94b54b8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:02:00 2021 -0500 fix links --- news/en/2021102901.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/news/en/2021102901.xml b/news/en/2021102901.xml index e925ff60..c6e56ba1 100644 --- a/news/en/2021102901.xml +++ b/news/en/2021102901.xml @@ -4,11 +4,11 @@ <body> <a href="{$root}/wwn/406">WWN Issue 406</a> was released today. <ul> - <li><a href="/winehq_org/wwn/406#New Author">New Author</a></li> - <li><a href="/winehq_org/wwn/406#Highlights From Wine 6.18 to Today">Highlights From Wine 6.18 to Today</a></li> - <li><a href="/winehq_org/wwn/406#Dinput Now Uses HID">Dinput Now Uses HID</a></li> - <li><a href="/winehq_org/wwn/406#Unicode 14">Unicode 14</a></li> - <li><a href="/winehq_org/wwn/406#Wine Mono">Wine Mono</a></li> + <li><a href="{$root}/wwn/406#New Author">New Author</a></li> + <li><a href="{$root}/wwn/406#Highlights From Wine 6.18 to Today">Highlights From Wine 6.18 to Today</a></li> + <li><a href="{$root}/wwn/406#Dinput Now Uses HID">Dinput Now Uses HID</a></li> + <li><a href="{$root}/wwn/406#Unicode 14">Unicode 14</a></li> + <li><a href="{$root}/wwn/406#Wine Mono">Wine Mono</a></li> </ul> </body> </news>

1 0

Jeremy Newman : WWN 406
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: d07244b5b6800d4a04348bd7966164c030143678 URL: https://source.winehq.org/git/website.git/?a=commit;h=d07244b5b6800d4a04348… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 07:52:24 2021 -0500 WWN 406 --- news/en/2021102901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2021102901.xml b/news/en/2021102901.xml new file mode 100644 index 00000000..e925ff60 --- /dev/null +++ b/news/en/2021102901.xml @@ -0,0 +1,14 @@ +<news> + <date>October 29, 2021</date> + <title>World Wine News Issue 406</title> + <body> + <a href="{$root}/wwn/406">WWN Issue 406</a> was released today. + <ul> + <li><a href="/winehq_org/wwn/406#New Author">New Author</a></li> + <li><a href="/winehq_org/wwn/406#Highlights From Wine 6.18 to Today">Highlights From Wine 6.18 to Today</a></li> + <li><a href="/winehq_org/wwn/406#Dinput Now Uses HID">Dinput Now Uses HID</a></li> + <li><a href="/winehq_org/wwn/406#Unicode 14">Unicode 14</a></li> + <li><a href="/winehq_org/wwn/406#Wine Mono">Wine Mono</a></li> + </ul> + </body> +</news>

1 0

Cressida Silver : WWN 406
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 1d60c21c78a79661cf7d9bb42db1c71ff010c818 URL: https://source.winehq.org/git/website.git/?a=commit;h=1d60c21c78a79661cf7d9… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Oct 29 07:46:37 2021 -0500 WWN 406 --- wwn/en/wn20211029_406.xml | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/wwn/en/wn20211029_406.xml b/wwn/en/wn20211029_406.xml new file mode 100644 index 00000000..46d1e9ff --- /dev/null +++ b/wwn/en/wn20211029_406.xml @@ -0,0 +1,105 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn@winehq.org">Cressida Silver</author> + <issue num="406" date="10/29/2021"/> + <intro> + <p> + This is the 406th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, + but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> + </p> + </intro> + + <section title="New Author" subject="WWN" archive="" posts=""> + <p> + Cressida Silver here. I am new to this, so please let's all play nice in the sandbox. I recently broke up with my former employer to start seeing CodeWeavers. So far so good. The goal is to bring you an edition of WWN the Friday following a Wine release. Feel free to provide tips, suggestions, insights, or generaly troll me (if you must) <a href="mailto:wwn@winehq.org">here.</a> + </p> + + <p> + Great, now that is out of the way and we are all friends, let's get to it. + </p> + </section> + + <section title="Highlights From Wine 6.18 to Today" subject="Overview" archive="" posts=""> + <p> + <b>Wine 6.18</b> + <ul> + <li>Shell32 and WineBus libraries converted to Portable Executable (PE)</li> + <li>Unicode data updated to Unicode version 14</li> + <li>Mono engine updated to version 6.4.0, with COM improvements</li> + <li>More work towards Dwarf 3/4 debug support</li> + <li>HID joystick enabled by default</li> + </ul> + </p> + + <p> + <b>Wine 6.19</b> + <ul> + <li>IPHlpApi, NsiProxy, WineDbg and a few other modules converted to PE</li> + <li>Additional work on HID</li> + <li>Kernel parts of GDI moved to Win32u</li> + <li>More work towards Dwarf 3/4 debug support</li> + </ul> + </p> + + <p> + <b>Wine 6.20</b> + <ul> + <li>MSXml, XAudio, DInput and a few other modules converted to PE</li> + <li>A few system libraries are bundled with the source to support PE builds</li> + <li>HID joystick is now the only supported joystick backend in DirectInput</li> + <li>Better support for MSVCRT builds in Winelib</li> + </ul> + </p> + </section> + + <section title="Dinput Now Uses HID" subject="HID" archive="" posts=""> + <p> + Tip of the hat to Rémi for this update. Previously, Wine’s DirectInput Implementation (dinput.dll and dinput8.dll) would talk directly to the hardware, and so would Wine's implementation of the lower-level HID APIs. Seeing double anyone? + That's right, Wine was talking to the hardware in two locations. Less than ideal, as this resulted in redundant + code. + </p> + + <p> + Windows currently implements dinput on top of the lower-level APIs. So Rémi’s work changed Wine to match that layout by + placing dinput above the lower-level APIs instead of allowing dinput to talk directly to the hardware. This results in a Wine that more accurately reflects Windows behavior, and allows applications to talk to both HID and dinput, as well as connect information from one to the other. + </p> + + <p> + Fewer places for APIs to speak with the hardware means fewer lines of code. Fewer lines of code means fewer opportunities for bugs. + Additionally, these changes will also make supporting additional backends easier in the future. The new layout means Wine more accurately reflects Windows behavior making controller support more consistent, and improving functionality of Windows applications that use both HID and dinput APIs. + </p> + </section> + + <section title="Unicode 14" subject="Unicode 14" archive="https://www.winehq.org/pipermail/wine-devel/2021-September/195389.html" posts="1"> + <p> + Nikolay has moved Wine from the boring world of Unicode 13 to the brave new world of Unicode 14. Who wants to live in a world without the melting smiley face or the bitten lower lip? Not us — that’s for sure. When Unicode 14 is rolled out to the interwebs at large, there will be a grand total of characters to 144,697. Of course, Wine requires the underlying system fonts to support the new Unicode characters, which will take some time. + </p> + + <p> + One hundred forty-four thousand six hundred ninety-seven characters on the wall, one hundred forty-four thousand... this is gonna take a while. In the meantime, you can read more about Unicode 14 <a href="//unicode.org/versions/Unicode14.0.0/">here.</a> + </p> + </section> + + <section title="Wine Mono" subject="Wine Mono" archive="" posts=""> + <p> + Updates to Wine Mono — the open-source, cross-platform implementation of .NET framework — by Esme improve the functionality + of the following: + <ul> + <li>IL-2 Sturmovik</li> + <li>Bizhawk</li> + <li>Magicka</li> + <li>FLY’N</li> + <li>The Sims 3 (launcher)</li> + <li>Sol Survivor</li> + <li>Stride</li> + <li>LiveSplit</li> + </ul> + </p> + + <p> + Also not to be overlooked, Esme has updated FNA to 21.08 and SDL to 2.0.16. FNA now uses mfplat instead of libtheorafile for media file handling, making it possible to load .wmv and .wma files if Wine has the necessary support. + </p> + </section> +</kc>

1 0

Alistair Leslie-Hughes : msdasql: Add IDBCreateCommand to session.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: e5f7a73c83a2b50db27c084b7b913a371fa1d4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f7a73c83a2b50db27c084b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 28 16:27:37 2021 +1100 msdasql: Add IDBCreateCommand to session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index d4d55f76c3c..e01dcf7ab7e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -40,6 +40,7 @@ struct msdasql_session IGetDataSource IGetDataSource_iface; IOpenRowset IOpenRowset_iface; ISessionProperties ISessionProperties_iface; + IDBCreateCommand IDBCreateCommand_iface; LONG refs; }; @@ -63,6 +64,11 @@ static inline struct msdasql_session *impl_from_ISessionProperties( ISessionProp return CONTAINING_RECORD( iface, struct msdasql_session, ISessionProperties_iface ); } +static inline struct msdasql_session *impl_from_IDBCreateCommand( IDBCreateCommand *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, IDBCreateCommand_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -90,6 +96,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_ISessionProperties %p)\n", iface, ppv); *ppv = &session->ISessionProperties_iface; } + else if(IsEqualGUID(&IID_IDBCreateCommand, riid)) + { + TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); + *ppv = &session->IDBCreateCommand_iface; + } if(*ppv) { @@ -246,6 +257,41 @@ static const ISessionPropertiesVtbl propertiesVtbl = properties_SetProperties }; +static HRESULT WINAPI createcommand_QueryInterface(IDBCreateCommand *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI createcommand_AddRef(IDBCreateCommand *iface) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_Release(&session->session_iface); +} + +static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, + IUnknown **out) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + FIXME("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + + return E_NOTIMPL; +} + +static const IDBCreateCommandVtbl createcommandVtbl = +{ + createcommand_QueryInterface, + createcommand_AddRef, + createcommand_Release, + createcommand_CreateCommand +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -259,6 +305,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; + session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk);

1 0

Alistair Leslie-Hughes : msdasql: Add ISessionProperties to session.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 2f4e22d05313f1641c51642c4bf7092ba9e6b8ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4e22d05313f1641c51642c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 28 16:27:36 2021 +1100 msdasql: Add ISessionProperties to session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 58 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 63 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 465a89d199a..d4d55f76c3c 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -39,6 +39,7 @@ struct msdasql_session IUnknown session_iface; IGetDataSource IGetDataSource_iface; IOpenRowset IOpenRowset_iface; + ISessionProperties ISessionProperties_iface; LONG refs; }; @@ -57,6 +58,11 @@ static inline struct msdasql_session *impl_from_IOpenRowset( IOpenRowset *iface return CONTAINING_RECORD( iface, struct msdasql_session, IOpenRowset_iface ); } +static inline struct msdasql_session *impl_from_ISessionProperties( ISessionProperties *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, ISessionProperties_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -79,6 +85,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_IOpenRowset %p)\n", iface, ppv); *ppv = &session->IOpenRowset_iface; } + else if(IsEqualGUID(&IID_ISessionProperties, riid)) + { + TRACE("(%p)->(IID_ISessionProperties %p)\n", iface, ppv); + *ppv = &session->ISessionProperties_iface; + } if(*ppv) { @@ -189,6 +200,52 @@ static const IOpenRowsetVtbl openrowsetVtbl = openrowset_OpenRowset }; +static HRESULT WINAPI properties_QueryInterface(ISessionProperties *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI properties_AddRef(ISessionProperties *iface) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI properties_Release(ISessionProperties *iface) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_Release(&session->session_iface); +} + + +static HRESULT WINAPI properties_GetProperties(ISessionProperties *iface, ULONG set_count, + const DBPROPIDSET id_sets[], ULONG *count, DBPROPSET **sets) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + FIXME("%p %d %p %p %p\n", session, set_count, id_sets, count, sets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI properties_SetProperties(ISessionProperties *iface, ULONG count, + DBPROPSET sets[]) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + FIXME("%p %d %p\n", session, count, sets); + + return S_OK; +} + +static const ISessionPropertiesVtbl propertiesVtbl = +{ + properties_QueryInterface, + properties_AddRef, + properties_Release, + properties_GetProperties, + properties_SetProperties +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -201,6 +258,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->session_iface.lpVtbl = &unkfactoryVtbl; session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; + session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 4eaf6c07355..0d9630070b3 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -160,6 +160,7 @@ static void test_sessions(void) IOpenRowset *openrowset = NULL; IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; + ISessionProperties *session_props = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -208,6 +209,10 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); + ok(hr == S_OK, "got 0x%08x\n", hr); + ISessionProperties_Release(session_props); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

← Newer
1
2
3
4
5
6
7
8
...
117
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021