April 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : dplayx: Create a IDirectPlay interface in DirectPlayCreate().
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 16dc683996b47d3b8cec949bb4a613ec1abd37d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dc683996b47d3b8cec949bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:21:28 2013 +0200 dplayx: Create a IDirectPlay interface in DirectPlayCreate(). --- dlls/dplayx/dplay.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 67e3c18..30a2ee3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5998,9 +5998,7 @@ HRESULT WINAPI DirectPlayCreate return DPERR_INVALIDPARAMS; } - /* Create an IDirectPlay object. We don't support that so we'll cheat and - give them an IDirectPlay2A object and hope that doesn't cause problems */ - if ( dplay_create( &IID_IDirectPlay2A, (void**)lplpDP ) != DP_OK ) + if ( dplay_create( &IID_IDirectPlay, (void**)lplpDP ) != DP_OK ) return DPERR_UNAVAILABLE; if( IsEqualGUID( &GUID_NULL, lpGUID ) )

1 0

Dmitry Timoshkov : comdlg32: Add a simple PrintDlgEx implementation which wraps around the PrintDlg one .
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: e0b4b9f63fbda54432c8c5c1753bc2dace44b511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b4b9f63fbda54432c8c5c17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 9 12:50:40 2013 +0900 comdlg32: Add a simple PrintDlgEx implementation which wraps around the PrintDlg one. --- dlls/comdlg32/printdlg.c | 143 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 138 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2d80fd5..e3b89ea 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -28,6 +28,7 @@ #include <string.h> #include <assert.h> +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" @@ -36,11 +37,12 @@ #include "winuser.h" #include "winspool.h" #include "winerror.h" +#include "objbase.h" +#include "commdlg.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "commdlg.h" #include "dlgs.h" #include "cderr.h" #include "cdlg.h" @@ -3932,6 +3934,80 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) return pagesetup_common(&data); } +static void pdlgex_to_pdlg(const PRINTDLGEXW *pdlgex, PRINTDLGW *pdlg) +{ + pdlg->lStructSize = sizeof(*pdlg); + pdlg->hwndOwner = pdlgex->hwndOwner; + pdlg->hDevMode = pdlgex->hDevMode; + pdlg->hDevNames = pdlgex->hDevNames; + pdlg->hDC = pdlgex->hDC; + pdlg->Flags = pdlgex->Flags; + if ((pdlgex->Flags & PD_NOPAGENUMS) || !pdlgex->nPageRanges || !pdlgex->lpPageRanges) + { + pdlg->nFromPage = 0; + pdlg->nToPage = 65534; + } + else + { + pdlg->nFromPage = pdlgex->lpPageRanges[0].nFromPage; + pdlg->nToPage = pdlgex->lpPageRanges[0].nToPage; + } + pdlg->nMinPage = pdlgex->nMinPage; + pdlg->nMaxPage = pdlgex->nMaxPage; + pdlg->nCopies = pdlgex->nCopies; + pdlg->hInstance = pdlgex->hInstance; + pdlg->lCustData = 0; + pdlg->lpfnPrintHook = NULL; + pdlg->lpfnSetupHook = NULL; + pdlg->lpPrintTemplateName = pdlgex->lpPrintTemplateName; + pdlg->lpSetupTemplateName = NULL; + pdlg->hPrintTemplate = NULL; + pdlg->hSetupTemplate = NULL; +} + +/* Only copy fields that are supposed to be changed. */ +static void pdlg_to_pdlgex(const PRINTDLGW *pdlg, PRINTDLGEXW *pdlgex) +{ + pdlgex->hDevMode = pdlg->hDevMode; + pdlgex->hDevNames = pdlg->hDevNames; + pdlgex->hDC = pdlg->hDC; + if (!(pdlgex->Flags & PD_NOPAGENUMS) && pdlgex->nPageRanges && pdlgex->lpPageRanges) + { + pdlgex->lpPageRanges[0].nFromPage = pdlg->nFromPage; + pdlgex->lpPageRanges[0].nToPage = pdlg->nToPage; + } + pdlgex->nMinPage = pdlg->nMinPage; + pdlgex->nMaxPage = pdlg->nMaxPage; + pdlgex->nCopies = pdlg->nCopies; +} + +struct callback_data +{ + IPrintDialogCallback *callback; + IObjectWithSite *object; +}; + +static UINT CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_INITDIALOG) + { + PRINTDLGW *pd = (PRINTDLGW *)lp; + struct callback_data *cb = (struct callback_data *)pd->lCustData; + + cb->callback->lpVtbl->SelectionChange(cb->callback); + cb->callback->lpVtbl->InitDone(cb->callback); + } + else + { +/* FIXME: store interface pointer somewhere in window properties and call it + HRESULT hres; + cb->callback->lpVtbl->HandleMessage(cb->callback, hwnd, msg, wp, lp, &hres); +*/ + } + + return 0; +} + /*********************************************************************** * PrintDlgExA (COMDLG32.@) * @@ -4003,9 +4079,39 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) } else { - FIXME("(%p) dialog not implemented\n", lppd); - return E_NOTIMPL; + PRINTDLGA pdlg; + struct callback_data cb_data = { 0 }; + + FIXME("(%p) semi-stub\n", lppd); + + if (lppd->lpCallback) + { + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IPrintDialogCallback, (void **)&cb_data.callback); + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IObjectWithSite, (void **)&cb_data.object); + } + + /* + * PRINTDLGEXA/W and PRINTDLGA/W layout is the same for A and W variants. + */ + pdlgex_to_pdlg((const PRINTDLGEXW *)lppd, (PRINTDLGW *)&pdlg); + pdlg.Flags |= PD_ENABLEPRINTHOOK; + pdlg.lpfnPrintHook = pdlgex_hook_proc; + pdlg.lCustData = (LPARAM)&cb_data; + + if (PrintDlgA(&pdlg)) + { + pdlg_to_pdlgex((const PRINTDLGW *)&pdlg, (PRINTDLGEXW *)lppd); + lppd->dwResultAction = PD_RESULT_PRINT; + } + else + lppd->dwResultAction = PD_RESULT_CANCEL; + + if (cb_data.callback) + cb_data.callback->lpVtbl->Release(cb_data.callback); + if (cb_data.object) + cb_data.object->lpVtbl->Release(cb_data.object); + return S_OK; } ClosePrinter(hprn); @@ -4124,9 +4230,36 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) } else { - FIXME("(%p) dialog not implemented\n", lppd); - return E_NOTIMPL; + PRINTDLGW pdlg; + struct callback_data cb_data = { 0 }; + + FIXME("(%p) semi-stub\n", lppd); + + if (lppd->lpCallback) + { + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IPrintDialogCallback, (void **)&cb_data.callback); + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IObjectWithSite, (void **)&cb_data.object); + } + + pdlgex_to_pdlg(lppd, &pdlg); + pdlg.Flags |= PD_ENABLEPRINTHOOK; + pdlg.lpfnPrintHook = pdlgex_hook_proc; + pdlg.lCustData = (LPARAM)&cb_data; + + if (PrintDlgW(&pdlg)) + { + pdlg_to_pdlgex(&pdlg, lppd); + lppd->dwResultAction = PD_RESULT_PRINT; + } + else + lppd->dwResultAction = PD_RESULT_CANCEL; + + if (cb_data.callback) + cb_data.callback->lpVtbl->Release(cb_data.callback); + if (cb_data.object) + cb_data.object->lpVtbl->Release(cb_data.object); + return S_OK; } ClosePrinter(hprn);

1 0

Dmitry Timoshkov : comdlg32: Add an interactive PrintDlgEx test.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: b73323d4e2049968e31f6d69ada2041580918e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73323d4e2049968e31f6d69a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 9 12:51:10 2013 +0900 comdlg32: Add an interactive PrintDlgEx test. --- dlls/comdlg32/tests/printdlg.c | 135 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index b6c8325..d004598 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -19,7 +19,11 @@ * */ +#define COBJMACROS +#define CONST_VTABLE + #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -35,6 +39,8 @@ /* ########################### */ +extern const IID IID_IObjectWithSite; + static HMODULE hcomdlg32; static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); @@ -43,6 +49,18 @@ static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); static const CHAR emptyA[] = ""; static const CHAR PrinterPortsA[] = "PrinterPorts"; +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + /* ########################### */ static void test_PageSetupDlgA(void) @@ -210,6 +228,98 @@ static void test_PrintDlgA(void) /* ########################### */ +static HRESULT WINAPI callback_QueryInterface(IPrintDialogCallback *iface, + REFIID riid, void **ppv) +{ + ok(0, "callback_QueryInterface(%s): unexpected call\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI callback_AddRef(IPrintDialogCallback *iface) +{ + trace("callback_AddRef\n"); + return 2; +} + +static ULONG WINAPI callback_Release(IPrintDialogCallback *iface) +{ + trace("callback_Release\n"); + return 1; +} + +static HRESULT WINAPI callback_InitDone(IPrintDialogCallback *iface) +{ + trace("callback_InitDone\n"); + return S_OK; +} + +static HRESULT WINAPI callback_SelectionChange(IPrintDialogCallback *iface) +{ + trace("callback_SelectionChange\n"); + return S_OK; +} + +static HRESULT WINAPI callback_HandleMessage(IPrintDialogCallback *iface, + HWND hdlg, UINT msg, WPARAM wp, LPARAM lp, LRESULT *res) +{ + trace("callback_HandleMessage %p,%04x,%lx,%lx,%p\n", hdlg, msg, wp, lp, res); + /* *res = PD_RESULT_PRINT; */ + return S_OK; +} + +static const IPrintDialogCallbackVtbl callback_Vtbl = +{ + callback_QueryInterface, + callback_AddRef, + callback_Release, + callback_InitDone, + callback_SelectionChange, + callback_HandleMessage +}; + +static IPrintDialogCallback callback = { &callback_Vtbl }; + +static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + trace("unknown_QueryInterface %s\n", debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IPrintDialogCallback)) + { + *ppv = &callback; + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IObjectWithSite)) + { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected IID %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI unknown_AddRef(IUnknown *iface) +{ + trace("unknown_AddRef\n"); + return 2; +} + +static ULONG WINAPI unknown_Release(IUnknown *iface) +{ + trace("unknown_Release\n"); + return 1; +} + +static const IUnknownVtbl unknown_Vtbl = +{ + unknown_QueryInterface, + unknown_AddRef, + unknown_Release +}; + +static IUnknown unknown = { &unknown_Vtbl }; + static void test_PrintDlgExW(void) { PRINTPAGERANGE pagerange[2]; @@ -370,9 +480,30 @@ static void test_PrintDlgExW(void) GlobalFree(pDlg->hDevNames); DeleteDC(pDlg->hDC); - HeapFree(GetProcessHeap(), 0, pDlg); - return; + /* interactive PrintDlgEx tests */ + + if (!winetest_interactive) + { + skip("interactive PrintDlgEx tests (set WINETEST_INTERACTIVE=1)\n"); + return; + } + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_NOPAGENUMS | PD_RETURNIC; + pDlg->nStartPage = START_PAGE_GENERAL; + pDlg->lpCallback = &unknown; + pDlg->dwResultAction = S_OK; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + ok(pDlg->dwResultAction == PD_RESULT_PRINT, "expected PD_RESULT_PRINT, got %#x\n", pDlg->dwResultAction); + ok(pDlg->hDC != NULL, "HDC missing for PD_RETURNIC\n"); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + DeleteDC(pDlg->hDC); + + HeapFree(GetProcessHeap(), 0, pDlg); } static BOOL abort_proc_called = FALSE;

1 0

Akihiro Sagawa : fonts: Add Fixedsys font.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 6eaa345261fad0e0a0e04f265ce6f731302ed674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaa345261fad0e0a0e04f265… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 8 21:55:05 2013 +0900 fonts: Add Fixedsys font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 4 + fonts/fixedsys.sfd | 2320 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/fixedsys.ttf | Bin 0 -> 10852 bytes tools/sfnt2fnt.c | 3 + 5 files changed, 2328 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaa345261fad0e0a0e04…

1 0

Nikolay Sivov : include: Added IRowsetNotify definition and proxy/ stub stub implementation.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 7f78caa81c0b33f40b0958974a8e5d4fb144856c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f78caa81c0b33f40b0958974… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 5 22:28:52 2013 +0400 include: Added IRowsetNotify definition and proxy/stub stub implementation. --- dlls/msdaps/usrmarshal.c | 40 +++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 3 ++ include/rstnot.idl | 74 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 5 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 3f2b9e6..39e4e4b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -967,3 +967,43 @@ HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTE peAsynchPhase, ppwszStatusText, ppErrorInfoRem); return E_NOTIMPL; } + +HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, + DBEVENTPHASE phase, BOOL cantdeny) +{ + FIXME("(%p)->(%p %ld %p %d %d %d): stub\n", This, rowset, rows, hrows, reason, phase, cantdeny); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, + DBEVENTPHASE phase, BOOL cantdeny) +{ + FIXME("(%p)->(%p %ld %p %d %d %d): stub\n", This, rowset, rows, hrows, reason, phase, cantdeny); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowsetNotify_OnFieldChange_Proxy(IRowsetNotify* This, IRowset *rowset, HROW row, DBORDINAL ccols, DBORDINAL *columns, + DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) +{ + FIXME("(%p)->(%p %lx %ld %p %d %d %d): stub\n", This, rowset, row, ccols, columns, reason, phase, cantdeny); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetNotify_OnFieldChange_Stub(IRowsetNotify* This, IRowset *rowset, HROW row, DBORDINAL ccols, DBORDINAL *columns, + DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) +{ + FIXME("(%p)->(%p %lx %ld %p %d %d %d): stub\n", This, rowset, row, ccols, columns, reason, phase, cantdeny); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowsetNotify_OnRowsetChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) +{ + FIXME("(%p)->(%p %d %d %d): stub\n", This, rowset, reason, phase, cantdeny); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetNotify_OnRowsetChange_Stub(IRowsetNotify* This, IRowset *rowset, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) +{ + FIXME("(%p)->(%p %d %d %d): stub\n", This, rowset, reason, phase, cantdeny); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 47df84c..9589c34 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -484,6 +484,7 @@ SRCDIR_INCLUDES = \ rstbas.idl \ rstinf.idl \ rstloc.idl \ + rstnot.idl \ rtutils.h \ scarderr.h \ schannel.h \ diff --git a/include/oledb.idl b/include/oledb.idl index fb57501..57b404d 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -34,6 +34,8 @@ typedef LONG_PTR DBROWCOUNT; typedef ULONG_PTR DBCOUNTITEM; typedef ULONG_PTR DBLENGTH; typedef ULONG_PTR DBORDINAL; +typedef DWORD DBREASON; +typedef DWORD DBEVENTPHASE; typedef ULONG_PTR DBBKMARK; typedef DWORD_PTR DB_DWRESERVE; typedef ULONG_PTR DBREFCOUNT; @@ -66,6 +68,7 @@ typedef struct { #include "asynot.idl" #include "asysta.idl" #include "sesprp.idl" +#include "rstnot.idl" #include "opnrst.idl" #include "row.idl" #include "rowchg.idl" diff --git a/include/rstnot.idl b/include/rstnot.idl new file mode 100644 index 0000000..c76691e --- /dev/null +++ b/include/rstnot.idl @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2013 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a83-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetNotify : IUnknown +{ + [local] + HRESULT OnFieldChange([in] IRowset *rowset, + [in] HROW row, + [in] DBORDINAL ccols, + [in, size_is((ULONG)ccols)] DBORDINAL *columns, + [in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cantdeny); + + [call_as(OnFieldChange)] + HRESULT RemoteOnFieldChange( + [in] IRowset *rowset, + [in] HROW row, + [in] DBORDINAL ccols, + [in, size_is((ULONG)ccols)] DBORDINAL *columns, + [in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cantdeny); + + [local] + HRESULT OnRowChange([in] IRowset *rowset, + [in] DBCOUNTITEM rows, + [in, size_is((ULONG)rows)] HROW *hrows, + [in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cantdeny); + + [call_as(OnRowChange)] + HRESULT RemoteOnRowChange( + [in] IRowset *rowset, + [in] DBCOUNTITEM rows, + [in, size_is((ULONG)rows)] HROW *hrows, + [in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cantdeny); + + [local] + HRESULT OnRowsetChange([in] IRowset *rowset, + [in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cantdeny); + + [call_as(OnRowsetChange)] + HRESULT RemoteOnRowsetChange( + [in] IRowset *rowset, + [in] DBREASON reason, + [in] DBEVENTPHASE phase, + [in] BOOL cantdeny); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index f408545..91b136d 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -157,6 +157,7 @@ my %private_idl_headers = ( "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1, + "rstnot.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1, "xmldom.idl" => 1,

1 0

Rico Schüller : winhlp32: Always open files as read only.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: ab8cc4acdbd3b4c8ea57d2378d4b736a1635ac97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8cc4acdbd3b4c8ea57d2378… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 7 14:39:18 2013 +0200 winhlp32: Always open files as read only. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 5e854f6..3a421da 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -180,7 +180,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) openfilename.nMaxFileTitle = 0; openfilename.lpstrInitialDir = szDir; openfilename.lpstrTitle = 0; - openfilename.Flags = OFN_ENABLESIZING; + openfilename.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_READONLY; openfilename.nFileOffset = 0; openfilename.nFileExtension = 0; openfilename.lpstrDefExt = 0;

1 0

Nikolay Sivov : gameux: Fix release/free of uninitialized pointers ( Coverity).
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 0bbd6cb0506bbd820dd9486e24518f81ed02c883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbd6cb0506bbd820dd9486e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 21:47:32 2013 +0400 gameux: Fix release/free of uninitialized pointers (Coverity). --- dlls/gameux/gameexplorer.c | 4 +++- dlls/gameux/gamestatistics.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 8f30601..8400c9e 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -681,7 +681,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { HRESULT hr; GAME_INSTALL_SCOPE installScope; LPWSTR lpRegistryPath; - LPWSTR lpGDFBinaryPath, lpGameInstallDirectory; + LPWSTR lpGDFBinaryPath; TRACE("(%s)\n", debugstr_guid(InstanceID)); @@ -702,6 +702,8 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { if(SUCCEEDED(hr)) { + WCHAR *lpGameInstallDirectory = NULL; + /* game found, it's registry path is in lpRegistryPath and install * scope in installScope */ TRACE("game found in registry (path %s), updating\n", debugstr_w(lpRegistryPath)); diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 619c616..54115f1 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -112,7 +112,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) HRESULT hr = S_OK; IXMLDOMDocument *document; - IXMLDOMElement *root, *categoryElement, *statisticsElement; + IXMLDOMElement *root, *statisticsElement; IXMLDOMNode *categoryNode, *statisticsNode; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, @@ -178,6 +178,8 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) for(i=0; i<MAX_CATEGORIES; ++i) { + IXMLDOMElement *categoryElement = NULL; + if(lstrlenW(stats->categories[i].sName)==0) continue; @@ -187,7 +189,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMDocument_createNode(document, vValue, bstrCategory, NULL, &categoryNode); if(SUCCEEDED(hr)) - hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (LPVOID*)&categoryElement); + hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (void**)&categoryElement); V_INT(&vValue) = i; if(SUCCEEDED(hr)) @@ -207,6 +209,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); } + if (categoryElement) + IXMLDOMElement_Release(categoryElement); + SysFreeString(V_BSTR(&vValue)); if(SUCCEEDED(hr)) @@ -269,7 +274,6 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); - IXMLDOMElement_Release(categoryElement); IXMLDOMNode_Release(categoryNode); if(FAILED(hr)) @@ -939,16 +943,13 @@ static HRESULT WINAPI GameStatisticsImpl_Save( BOOL trackChanges) { GameStatisticsImpl *This = impl_from_IGameStatistics(iface); - HRESULT hr = S_OK; TRACE("(%p, %d)\n", This, trackChanges); if(trackChanges) FIXME("tracking changes not yet implemented\n"); - hr = GAMEUX_updateStatisticsFile(&This->stats); - - return hr; + return GAMEUX_updateStatisticsFile(&This->stats); } static HRESULT WINAPI GameStatisticsImpl_SetLastPlayedCategory(

1 0

Nikolay Sivov : oledb32: Implemented conversion from DBTYPE_VARIANT to DBTYPE_BSTR.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 15bb6bfa683aacee513e104ec6534921cf8d93c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bb6bfa683aacee513e104ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 14:57:09 2013 +0400 oledb32: Implemented conversion from DBTYPE_VARIANT to DBTYPE_BSTR. --- dlls/oledb32/convert.c | 9 +++++++++ dlls/oledb32/tests/convert.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index badb899..f56601b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -503,6 +503,15 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } } break; + case DBTYPE_VARIANT: + { + VARIANT tmp; + + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + *d = V_BSTR(&tmp); + } + break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 9d50b8a..dd80fe4 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -926,6 +926,7 @@ static void test_converttobstr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + VARIANT v; BSTR b; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -972,6 +973,19 @@ static void test_converttobstr(void) SysFreeString(dst); SysFreeString(b); + b = SysAllocString(ten); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(dst != b, "got %p src %p\n", dst, b); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + SysFreeString(dst); + SysFreeString(b); + IDataConvert_Release(convert); }

1 0

Nikolay Sivov : oledb32: Implement GetConversionSize for DBTYPE_VARIANT -> DBTYPE_STR case.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 960852f44780742b9bc1099a4b13222ef076cd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=960852f44780742b9bc1099a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 15:52:31 2013 +0400 oledb32: Implement GetConversionSize for DBTYPE_VARIANT -> DBTYPE_STR case. --- dlls/oledb32/convert.c | 54 ++++++++++++++++++++++++++++++++++++++---- dlls/oledb32/tests/convert.c | 30 +++++++++++++++++++++++ 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f56601b..f2c46b0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -996,14 +996,58 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, } static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, - DBTYPE wSrcType, DBTYPE wDstType, - DBLENGTH *pcbSrcLength, DBLENGTH *pcbDstLength, - void *pSrc) + DBTYPE src_type, DBTYPE dst_type, + DBLENGTH *src_len, DBLENGTH *dst_len, + void *src) { convert *This = impl_from_IDataConvert(iface); - FIXME("(%p)->(%d, %d, %p, %p, %p): stub\n", This, wSrcType, wDstType, pcbSrcLength, pcbDstLength, pSrc); + HRESULT hr; + + TRACE("(%p)->(%d, %d, %p, %p, %p)\n", This, src_type, dst_type, src_len, dst_len, src); + + hr = IDataConvert_CanConvert(iface, src_type, dst_type); + if (hr != S_OK) + return DB_E_UNSUPPORTEDCONVERSION; + + if (!dst_len) + return E_INVALIDARG; + + /* for some types we don't need to look into source data */ + if ((*dst_len = get_length(dst_type))) + return S_OK; + + switch (dst_type) + { + case DBTYPE_STR: + { + switch (src_type) + { + case DBTYPE_VARIANT: + { + VARIANT v; - return E_NOTIMPL; + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), -1, NULL, 0, NULL, NULL); + VariantClear(&v); + } + else + return hr; + } + break; + default: + FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); + return E_NOTIMPL; + } + } + break; + default: + FIXME("unimplemented for destination type %d\n", dst_type); + return E_NOTIMPL; + } + + return S_OK; } static const struct IDataConvertVtbl convert_vtbl = diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index dd80fe4..400ea3d 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2435,6 +2435,35 @@ todo_wine IDataConvert_Release(convert); } +static void test_getconversionsize(void) +{ + IDataConvert *convert; + DBLENGTH dst_len; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + /* same way as CanConvert fails here */ + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_NULL, DBTYPE_BSTR, NULL, &dst_len, NULL); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got 0x%08x\n", hr); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 4, "got %ld\n", dst_len); + + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -2453,5 +2482,6 @@ START_TEST(convert) test_converttofiletime(); test_converttocy(); test_converttoui8(); + test_getconversionsize(); OleUninitialize(); }

1 0

Nikolay Sivov : oledb32: Implement DBTYPE_BSTR to DBTYPE_VARIANT conversion .
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 38a362a25ca9e85bcc656d680f9d01187f82d2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a362a25ca9e85bcc656d680… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 7 23:28:33 2013 +0400 oledb32: Implement DBTYPE_BSTR to DBTYPE_VARIANT conversion. --- dlls/oledb32/convert.c | 22 ++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f2c46b0..0e31e4a 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -145,6 +145,8 @@ static int get_length(DBTYPE type) case DBTYPE_STR: case DBTYPE_BYREF | DBTYPE_WSTR: return 0; + case DBTYPE_VARIANT: + return sizeof(VARIANT); default: FIXME("Unhandled type %04x\n", type); return 0; @@ -727,6 +729,26 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return hr; } + case DBTYPE_VARIANT: + { + VARIANT *v = dst; + + switch(src_type) + { + case DBTYPE_BSTR: + { + BSTR s = *(WCHAR**)src; + TRACE("%s\n", debugstr_w(s)); + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString(s); + hr = V_BSTR(v) ? S_OK : E_OUTOFMEMORY; + } + break; + default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL; + } + break; + } + default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 400ea3d..3c2f661 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2440,6 +2440,7 @@ static void test_getconversionsize(void) IDataConvert *convert; DBLENGTH dst_len; HRESULT hr; + BSTR str; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2461,6 +2462,43 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* size doesn't include string size */ + str = SysAllocStringLen(NULL, 10); + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_BSTR, DBTYPE_VARIANT, NULL, &dst_len, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == sizeof(VARIANT), "%ld\n", dst_len); + SysFreeString(str); + + IDataConvert_Release(convert); +} + +static void test_converttovar(void) +{ + static WCHAR strW[] = {'t','e','s','t',0}; + IDataConvert *convert; + DBSTATUS dst_status; + DBLENGTH dst_len; + VARIANT dst; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), &dst_len, strW, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_BSTR, "got %d\n", V_VT(&dst)); + ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst))); + VariantClear(&dst); + IDataConvert_Release(convert); } @@ -2482,6 +2520,7 @@ START_TEST(convert) test_converttofiletime(); test_converttocy(); test_converttoui8(); + test_converttovar(); test_getconversionsize(); OleUninitialize(); }

1 0