December 2019 - Wine-Devel - list.winehq.org

[PATCH] usp10: Fix the spelling of some comments.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/usp10/bidi.c | 4 ++-- dlls/usp10/shape.c | 2 +- dlls/usp10/usp10.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 34ca955dcb1..e1d0a11697d 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -72,7 +72,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); Note: The list of bidirectional character types here is not grouped the - same way as the table 3-7, since the numberic values for the types + same way as the table 3-7, since the numeric values for the types are chosen to keep the state and action tables compact. ------------------------------------------------------------------------*/ enum directions @@ -1083,7 +1083,7 @@ search: } /************************************************************* - * BIDI_DeterminLevels + * BIDI_DetermineLevels */ BOOL BIDI_DetermineLevels( const WCHAR *lpString, /* [in] The string for which information is to be returned */ diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 86e80aacd5f..8d5d1265fa5 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -998,7 +998,7 @@ static inline BOOL left_join_causing(CHAR joining_type) static inline BOOL word_break_causing(WCHAR chr) { - /* we are working within a string of characters already guareented to + /* we are working within a string of characters already guaranteed to be within one script, Syriac, so we do not worry about any character other than the space character outside of that range */ return (chr == 0 || chr == 0x20 ); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f66e85cc485..dd6a8543566 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3009,7 +3009,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, else /* (glyph_index >= cGlyphs) */ i = cChars; - /* If not snaping in the reverse direction (such as Hebrew) Then 0 + /* If not snapping in the reverse direction (such as Hebrew) Then 0 point flow to the next character */ if (direction < 0) { -- 2.20.1

1 0

[PATCH] ole32: Fix the spelling of a couple of comments.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/ifs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index ea03e9b0a28..9c7cb0977f8 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -60,7 +60,7 @@ typedef struct { /* this is the static object instance */ static _Malloc32 Malloc32 = {{&VT_IMalloc32}, 0, NULL, 0, 0, NULL, 0}; -/* with a spy active all calls from pre to post methods are threadsave */ +/* with a spy active all calls from pre to post methods are threadsafe */ static CRITICAL_SECTION IMalloc32_SpyCS; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -285,8 +285,8 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) * * NOTES * FIXME returns: - * win95: size allocated (4 byte boundarys) - * win2k: size originally requested !!! (allocated on 8 byte boundarys) + * win95: size allocated (4 byte boundaries) + * win2k: size originally requested !!! (allocated on 8 byte boundaries) */ static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) { -- 2.20.1

1 0

[PATCH] wineps.drv: Avoid unneeded abbreviations in comments.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wineps.drv/ppd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index aa013940fe7..662dbe6db7e 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -283,7 +283,7 @@ static BOOL get_line( char *buf, int size, struct map_context *ctx ) * * PSDRV_PPDGetInvocationValue * - * Passed string that should be surrounded by `"'s, return string alloced + * Passed string that should be surrounded by `"'s, return string allocated * from process heap. */ static BOOL PSDRV_PPDGetInvocationValue(struct map_context *ctx, PPDTuple *tuple) @@ -318,7 +318,7 @@ static BOOL PSDRV_PPDGetInvocationValue(struct map_context *ctx, PPDTuple *tuple * PSDRV_PPDGetQuotedValue * * Passed string that should be surrounded by `"'s. Expand <xx> as hex - * return string alloced from process heap. + * return string allocated from process heap. */ static BOOL PSDRV_PPDGetQuotedValue(struct map_context *ctx, PPDTuple *tuple) { @@ -517,7 +517,7 @@ static DUPLEX *get_duplex( PPD *ppd, const char *name ) * * PSDRV_PPDGetWord * - * Returns ptr alloced from heap to first word in str. Strips leading spaces. + * Returns ptr allocated from heap to first word in str. Strips leading spaces. * Puts ptr to next word in next */ static char *PSDRV_PPDGetWord(char *str, char **next) -- 2.20.1

1 0

[PATCH] include: Fix the spelling of some comments.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/objbase.h | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 78ec6d366db..75280d6de70 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -146,7 +146,7 @@ * - Each method is declared as a pointer to function field in the jump table. The implementation * will fill this jump table with appropriate values, probably using a static variable, and * initialize the lpVtbl field to point to this variable. - * - The IDirect3D_Xxx macros then just derefence the lpVtbl pointer and use the function pointer + * - The IDirect3D_Xxx macros then just dereference the lpVtbl pointer and use the function pointer * corresponding to the macro name. This emulates the behavior of a virtual table and should be * just as fast. * - This C code should be quite compatible with the Windows headers both for code that uses COM diff --git a/include/winbase.h b/include/winbase.h index 7b7f9f26bd2..2781229fa1e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1288,7 +1288,7 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF (0x00000040) #define ACTCTX_FLAG_HMODULE_VALID (0x00000080) -/* flags to DeactiveActCtx */ +/* flags to DeactivateActCtx */ #define DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION (0x00000001) /* flags to FindActCtxSection{Guid,String[AW]} */ -- 2.20.1

1 0

[PATCH] ucrtbase: Use given context in wcstok.
by Daniel Lehman Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- breaking change in 2015 for wcstok: https://docs.microsoft.com/en-us/cpp/porting/visual-cpp-change-history-2003… compilation will fail if only 2 arguments are provided: 1>: error C4996: 'wcstok': wcstok has been changed to conform with the ISO C standard, adding an extra context parameter. To use the legacy Microsoft wcstok, define _CRT_NON_CONFORMING_WCSTOK. 1>C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt\corecrt_wstring.h(261): message : see declaration of 'wcstok' --- dlls/msvcrt/wcs.c | 9 +++++++++ dlls/ucrtbase/tests/string.c | 30 ++++++++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1ae292423c0..a7bfb4ba2db 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1707,10 +1707,19 @@ MSVCRT_wchar_t * CDECL MSVCRT_wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_ /********************************************************************* * wcstok (MSVCRT.@) */ +#if _MSVCR_VER>=140 +MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim, MSVCRT_wchar_t **ctx ) +{ + if (!ctx) + ctx = &msvcrt_get_thread_data()->wcstok_next; + return MSVCRT_wcstok_s(str, delim, ctx); +} +#else MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim ) { return MSVCRT_wcstok_s(str, delim, &msvcrt_get_thread_data()->wcstok_next); } +#endif /********************************************************************* * _wctomb_s_l (MSVCRT.@) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index bfa602c5387..5ef638e44ac 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -83,6 +83,7 @@ static void (__cdecl *p__free_locale)(_locale_t); static int (__cdecl *p__getmbcp)(void); static int (__cdecl *p__setmbcp)(int); static size_t (__cdecl *p__mbsspn)(const unsigned char*, const unsigned char*); +static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*, wchar_t**); static BOOL init(void) { @@ -110,6 +111,7 @@ static BOOL init(void) p__getmbcp = (void*)GetProcAddress(module, "_getmbcp"); p__setmbcp = (void*)GetProcAddress(module, "_setmbcp"); p__mbsspn = (void*)GetProcAddress(module, "_mbsspn"); + p_wcstok = (void*)GetProcAddress(module, "wcstok"); return TRUE; } @@ -390,6 +392,33 @@ static void test_mbsspn( void) p__setmbcp(cp); } +static void test_wcstok(void) +{ + static const wchar_t *input = L"two words"; + wchar_t buffer[16]; + wchar_t *token; + wchar_t *next; + + next = NULL; + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", &next); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + ok(next == token + 4, "expected %p, got %p\n", token + 4, next); + token = p_wcstok(NULL, L" ", &next); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + ok(next == token + 5, "expected %p, got %p\n", token + 5, next); + token = p_wcstok(NULL, L" ", &next); + ok(!token, "expected NULL, got %p\n", token); + + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", NULL); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!token, "expected NULL, got %p\n", token); +} + START_TEST(string) { if (!init()) return; @@ -399,4 +428,5 @@ START_TEST(string) test___strncnt(); test_C_locale(); test_mbsspn(); + test_wcstok(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a262cc63459..64102f59cd4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2579,7 +2579,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstof(ptr ptr) MSVCRT_wcstof @ stub wcstoimax -@ cdecl wcstok(wstr wstr) MSVCRT_wcstok +@ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold -- 2.17.1

1 0

[PATCH] wine.inf: add powershell location to the path
by Louis Lenders Dec. 12, 2019

Dec. 12, 2019

On win7 the location of powershell is present in the path (could not check on other versions) --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d324461c6e..d62fd5065b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -624,7 +624,7 @@ HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" -HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" +HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem;%11%\WindowsPowershell\v1.0" HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%" -- 2.24.0

1 0

[PATCH] include: Add cdosys.idl
by Alistair Leslie-Hughes Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/cdosys.idl | 243 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 include/cdosys.idl diff --git a/include/Makefile.in b/include/Makefile.in index 2e9a921df7..7f73ee9010 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -51,6 +51,7 @@ SOURCES = \ bluetoothapis.h \ bthsdpdef.h \ cderr.h \ + cdosys.idl \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cdosys.idl b/include/cdosys.idl new file mode 100644 index 0000000000..8aee555058 --- /dev/null +++ b/include/cdosys.idl @@ -0,0 +1,243 @@ +/* + * Copyright (C) 2019 Alistair Leslie-Hughes + * + * 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 + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + uuid(cd000000-8b95-11d1-82db-00c04fb1625d), + version(1.0) +] +library CDO +{ + importlib("stdole2.tlb"); + + interface _Stream; + interface IBodyPart; + interface IBodyParts; + interface IConfiguration; + interface IDataSource; + interface Fields; + + typedef enum + { + cdoDSNDefault = 0, + cdoDSNNever = 1, + cdoDSNFailure = 2, + cdoDSNSuccess = 4, + cdoDSNDelay = 8, + cdoDSNSuccessFailOrDelay = 14 + } CdoDSNOptions; + + typedef enum + { + cdoRefTypeId = 0, + cdoRefTypeLocation = 1 + } CdoReferenceType; + + typedef enum + { + cdoSuppressNone = 0, + cdoSuppressImages = 1, + cdoSuppressBGSounds = 2, + cdoSuppressFrames = 4, + cdoSuppressObjects = 8, + cdoSuppressStyleSheets = 16, + cdoSuppressAll = 31 + } CdoMHTMLFlags; + + [ + odl, + uuid(cd000020-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IMessage : IDispatch + { + [id(0x00000065), propget] + HRESULT BCC([out, retval] BSTR *bcc); + [id(0x00000065), propput] + HRESULT BCC([in] BSTR bcc); + + [id(0x00000067), propget] + HRESULT CC([out, retval] BSTR *cc); + [id(0x00000067), propput] + HRESULT CC([in] BSTR cc); + + [id(0x00000069), propget] + HRESULT FollowUpTo([out, retval] BSTR *follow); + [id(0x00000069), propput] + HRESULT FollowUpTo([in] BSTR follow); + + [id(0x0000006a), propget] + HRESULT From([out, retval] BSTR *from); + [id(0x0000006a), propput] + HRESULT From([in] BSTR from); + + [id(0x0000006b), propget] + HRESULT Keywords([out, retval] BSTR* keywords); + [id(0x0000006b), propput] + HRESULT Keywords([in] BSTR keywords); + + [id(0x0000006e), propget] + HRESULT MimeFormatted([out, retval] VARIANT_BOOL *formatted); + [id(0x0000006e), propput] + HRESULT MimeFormatted([in] VARIANT_BOOL formatted); + + [id(0x0000006f), propget] + HRESULT Newsgroups([out, retval] BSTR *newsgroups); + [id(0x0000006f), propput] + HRESULT Newsgroups([in] BSTR newsgroups); + [id(0x00000070), propget] + + HRESULT Organization([out, retval] BSTR *organization); + [id(0x00000070), propput] + HRESULT Organization([in] BSTR organization); + + [id(0x00000072), propget] + HRESULT ReceivedTime([out, retval] DATE *received); + + [id(0x00000073), propget] + HRESULT ReplyTo([out, retval] BSTR *reply); + [id(0x00000073), propput] + HRESULT ReplyTo([in] BSTR reply); + + [id(0x00000074), propget] + HRESULT DSNOptions([out, retval] CdoDSNOptions *options); + [id(0x00000074), propput] + HRESULT DSNOptions([in] CdoDSNOptions options); + + [id(0x00000077), propget] + HRESULT SentOn([out, retval] DATE *sent); + + [id(0x00000078), propget] + HRESULT Subject([out, retval] BSTR *subject); + [id(0x00000078), propput] + HRESULT Subject([in] BSTR subject); + + [id(0x00000079), propget] + HRESULT To([out, retval] BSTR *to); + [id(0x00000079), propput] + HRESULT To([in] BSTR to); + + [id(0x0000007b), propget] + HRESULT TextBody([out, retval] BSTR *body); + [id(0x0000007b), propput] + HRESULT TextBody([in] BSTR body); + + [id(0x0000007c)] + HRESULT HTMLBody([out, retval] BSTR* body); + [id(0x0000007c), propput] + HRESULT HTMLBody([in] BSTR body); + + [id(0x0000007d), propget] + HRESULT Attachments([out, retval] IBodyParts **attachments); + + [id(0x0000007e), propget] + HRESULT Sender([out, retval] BSTR *sender); + [id(0x0000007e), propput] + HRESULT Sender([in] BSTR sender); + + [id(0x0000007f), propget] + HRESULT Configuration([out, retval] IConfiguration **config); + [id(0x0000007f), propput] + HRESULT Configuration([in] IConfiguration *config); + [id(0x0000007f), propputref] + HRESULT Configuration([in] IConfiguration *config); + + [id(0x00000080), propget] + HRESULT AutoGenerateTextBody([out, retval] VARIANT_BOOL *body); + [id(0x00000080), propput] + HRESULT AutoGenerateTextBody([in] VARIANT_BOOL body); + + [id(0x00000081), propget] + HRESULT EnvelopeFields([out, retval] Fields **fields); + + [id(0x00000082), propget] + HRESULT TextBodyPart([out, retval] IBodyPart **body); + [id(0x00000083), propget] + HRESULT HTMLBodyPart([out, retval] IBodyPart **body); + + [id(0x00000084), propget] + HRESULT BodyPart([out, retval] IBodyPart ** part); + + [id(0x00000085), propget] + HRESULT DataSource([out, retval] IDataSource **datasource); + + [id(0x00000086), propget] + HRESULT Fields([out, retval] Fields **fields); + + [id(0x00000087), propget] + HRESULT MDNRequested([out, retval] VARIANT_BOOL* requested); + [id(0x00000087), propput] + HRESULT MDNRequested([in] VARIANT_BOOL requested); + + [id(0x00000096)] + HRESULT AddRelatedBodyPart([in] BSTR url, [in] BSTR Reference, [in] CdoReferenceType ReferenceType, + [in, optional] BSTR username, [in, optional] BSTR password, [out, retval] IBodyPart **body); + [id(0x00000097)] + HRESULT AddAttachment([in] BSTR url, [in, optional] BSTR username, + [in, optional] BSTR password, [out, retval] IBodyPart **body); + + [id(0x00000098)] + HRESULT CreateMHTMLBody([in] BSTR url, [in, optional, defaultvalue(0)] CdoMHTMLFlags flags, + [in, optional] BSTR username, [in, optional] BSTR password); + + [id(0x00000099)] + HRESULT Forward([out, retval] IMessage **msg); + + [id(0x0000009a)] + HRESULT Post(); + + [id(0x0000009b)] + HRESULT PostReply([out, retval] IMessage **msg); + + [id(0x0000009c)] + HRESULT Reply([out, retval] IMessage **msg); + + [id(0x0000009d)] + HRESULT ReplyAll([out, retval] IMessage **msg); + + [id(0x0000009e)] + HRESULT Send(); + + [id(0x0000009f)] + HRESULT GetStream([out, retval] _Stream **stream); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR name, [out, retval] IDispatch **unknown); + }; + + [ + uuid(cd000001-8b95-11d1-82db-00c04fb1625d) + ] + coclass Message + { + [default] interface IMessage; + interface IDataSource; + interface IBodyPart; + }; +} + -- 2.17.1

1 0

[PATCH vkd3d v2 0/5] vkd3d: Add more null resources.
by Conor McCarthy Dec. 12, 2019

Dec. 12, 2019

An attempt to create a null resource view of an unsupported type leaves the descriptor uninitialised without having any means of indicating that an error occurred. Hitman 2 uses all of these view types. Conor McCarthy (5): vkd3d: Use helper functions for null resource initialisation. vkd3d: Add 1D null resources. vkd3d: Add 2D multisampled null resources. vkd3d: Add 3D null resources. vkd3d: Add cubic null resource. libs/vkd3d/resource.c | 363 +++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 15 ++ 2 files changed, 280 insertions(+), 98 deletions(-) -- 2.24.0

1 5

[PATCH 1/8] wineqtdecoder: Store the sink as a strmbase_sink structure.
by Zebediah Figura Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 43 ++++++++++++++------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index d861110f5f1..c8a34cbf95e 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -138,7 +138,7 @@ typedef struct QTOutPin { } QTOutPin; typedef struct QTInPin { - struct strmbase_pin pin; + struct strmbase_sink pin; GUID subType; IAsyncReader *pReader; @@ -199,7 +199,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) static inline QTInPin *impl_from_IPin(IPin *iface) { - return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); + return CONTAINING_RECORD(iface, QTInPin, pin.pin.IPin_iface); } /* @@ -211,7 +211,7 @@ static struct strmbase_pin *qt_splitter_get_pin(struct strmbase_filter *base, un QTSplitter *filter = impl_from_strmbase_filter(base); if (index == 0) - return &filter->pInputPin.pin; + return &filter->pInputPin.pin.pin; else if (index == 1) { if (filter->pVideo_Pin) @@ -232,18 +232,15 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ + if (filter->pInputPin.pin.pin.peer) + IPin_Disconnect(filter->pInputPin.pin.pin.peer); - if (filter->pInputPin.pin.peer) - IPin_Disconnect(filter->pInputPin.pin.peer); - - FreeMediaType(&filter->pInputPin.pin.mt); if (filter->pInputPin.pAlloc) IMemAllocator_Release(filter->pInputPin.pAlloc); filter->pInputPin.pAlloc = NULL; if (filter->pInputPin.pReader) IAsyncReader_Release(filter->pInputPin.pReader); filter->pInputPin.pReader = NULL; - filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; if (filter->pQTMovie) { @@ -274,6 +271,7 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); + strmbase_sink_cleanup(&filter->pInputPin.pin); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -333,10 +331,10 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE return S_FALSE; } -static const BasePinFuncTable sink_ops = +static const struct strmbase_sink_ops sink_ops = { - .pin_query_accept = sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) @@ -357,6 +355,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) ZeroMemory(This,sizeof(*This)); strmbase_filter_init(&This->filter, outer, &CLSID_QTSplitter, &filter_ops); + strmbase_sink_init(&This->pInputPin.pin, &QT_InputPin_Vtbl, &This->filter, + wcsInputPinName, &sink_ops, NULL); InitializeCriticalSection(&This->csReceive); This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive"); @@ -366,13 +366,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->aSession = NULL; This->runEvent = CreateEventW(NULL, 0, 0, NULL); - This->pInputPin.pin.dir = PINDIR_INPUT; - This->pInputPin.pin.filter = &This->filter; - lstrcpynW(This->pInputPin.pin.name, wcsInputPinName, ARRAY_SIZE(This->pInputPin.pin.name)); - This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; - This->pInputPin.pin.peer = NULL; - This->pInputPin.pin.pFuncsTable = &sink_ops; - *phr = S_OK; return &This->filter.IUnknown_inner; } @@ -984,7 +977,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, EnterCriticalSection(&filter->filter.csFilter); This->pReader = NULL; - if (This->pin.peer) + if (This->pin.pin.peer) hr = VFW_E_ALREADY_CONNECTED; else if (IPin_QueryAccept(iface, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -1066,22 +1059,22 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface) { HRESULT hr; QTInPin *This = impl_from_IPin(iface); - QTSplitter *filter = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *filter = impl_from_strmbase_filter(This->pin.pin.filter); FILTER_STATE state; TRACE("()\n"); hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state); EnterCriticalSection(&filter->filter.csFilter); - if (This->pin.peer) + if (This->pin.pin.peer) { - QTSplitter *Parser = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *Parser = impl_from_strmbase_filter(This->pin.pin.filter); if (SUCCEEDED(hr) && state == State_Stopped) { IMemAllocator_Decommit(This->pAlloc); - IPin_Disconnect(This->pin.peer); - IPin_Release(This->pin.peer); - This->pin.peer = NULL; + IPin_Disconnect(This->pin.pin.peer); + IPin_Release(This->pin.pin.peer); + This->pin.pin.peer = NULL; hr = QT_RemoveOutputPins(Parser); } else -- 2.24.0

2 10

[PATCH 2/2] msado15: Add _Command stub interface
by Alistair Leslie-Hughes Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/Makefile.in | 1 + dlls/msado15/command.c | 388 +++++++++++++++++++++++++++++++ dlls/msado15/main.c | 5 + dlls/msado15/msado15_classes.idl | 8 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/tests/msado15.c | 28 +++ 6 files changed, 431 insertions(+) create mode 100644 dlls/msado15/command.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 604f9ff018..9852e0863d 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + command.c \ connection.c \ main.c \ recordset.c \ diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c new file mode 100644 index 0000000000..9856b52e91 --- /dev/null +++ b/dlls/msado15/command.c @@ -0,0 +1,388 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado); + +struct command +{ + _Command Command_iface; + + LONG ref; +}; + + +static inline struct command *impl_from_Command(_Command *iface) +{ + return CONTAINING_RECORD(iface, struct command, Command_iface); +} + +static HRESULT WINAPI command_QueryInterface(_Command *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_Command(iface); + TRACE("(%p)->(%s, %p)\n", command, debugstr_guid(riid), out); + + *out = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Command15) || + IsEqualIID(riid, &IID_Command25) || + IsEqualIID(riid, &IID__Command)) + { + *out = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + _Command_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI command_AddRef(_Command *iface) +{ + struct command *command = impl_from_Command(iface); + TRACE("(%p)\n", command); + + return InterlockedIncrement(&command->ref); +} + +static ULONG WINAPI command_Release(_Command *iface) +{ + struct command *command = impl_from_Command(iface); + LONG ref; + + TRACE("(%p)\n", command); + + ref = InterlockedDecrement(&command->ref); + if (!ref) + heap_free(command); + + return ref; +} + +static HRESULT WINAPI command_GetTypeInfoCount(_Command *iface, UINT *pctinfo) +{ + struct command *command = impl_from_Command(iface); + TRACE("(%p)->()\n", command); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI command_GetTypeInfo(_Command *iface, UINT iTInfo, LCID lcid, ITypeInfo **typeinfo) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%u %u %p)\n", command, iTInfo, lcid, typeinfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetIDsOfNames(_Command *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", command, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Invoke(_Command *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", command, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Properties(_Command *iface, Properties **props) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, props); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_ActiveConnection(_Command *iface, _Connection **connection) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, connection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_ActiveConnection(_Command *iface, _Connection *connection) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, connection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_ActiveConnection(_Command *iface, VARIANT connection) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->()\n", command); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandText(_Command *iface, BSTR *text) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandText(_Command *iface, BSTR text) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s)\n", command, debugstr_w(text)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandTimeout(_Command *iface, LONG *timeout) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandTimeout(_Command *iface, LONG timeout) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Prepared(_Command *iface, VARIANT_BOOL *prepared) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, prepared); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Prepared(_Command *iface, VARIANT_BOOL prepared) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, prepared); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Execute(_Command *iface, VARIANT *recordsaffected, VARIANT *parameters, + LONG options, _Recordset **recordset) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p %p %d %p)\n", command, recordsaffected, parameters, options, recordset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_CreateParameter(_Command *iface, BSTR name, DataTypeEnum type, + ParameterDirectionEnum direction, LONG size, VARIANT value, _Parameter **parameter) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s %d %d %d %p)\n", command, debugstr_w(name), type, direction, size, + parameter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Parameters(_Command *iface, Parameters **parameters) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, parameters); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandType(_Command *iface, CommandTypeEnum cmdtype) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, cmdtype); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandType(_Command *iface, CommandTypeEnum *cmdtype) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, cmdtype); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Name(_Command *iface, BSTR name) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s)\n", command, debugstr_w(name)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_State(_Command *iface, LONG *state) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Cancel(_Command *iface) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->()\n", command); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_CommandStream(_Command *iface, IUnknown *stream) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandStream(_Command *iface, VARIANT *stream) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Dialect(_Command *iface, BSTR dialect) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s)\n", command, debugstr_w(dialect)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Dialect(_Command *iface, BSTR *dialect) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, dialect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_NamedParameters(_Command *iface, VARIANT_BOOL namedparameters) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, namedparameters); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_NamedParameters(_Command *iface, VARIANT_BOOL *namedparameters) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, namedparameters); + + return E_NOTIMPL; +} + +static const struct _CommandVtbl command_vtbl = +{ + command_QueryInterface, + command_AddRef, + command_Release, + command_GetTypeInfoCount, + command_GetTypeInfo, + command_GetIDsOfNames, + command_Invoke, + command_get_Properties, + command_get_ActiveConnection, + command_putref_ActiveConnection, + command_put_ActiveConnection, + command_get_CommandText, + command_put_CommandText, + command_get_CommandTimeout, + command_put_CommandTimeout, + command_get_Prepared, + command_put_Prepared, + command_Execute, + command_CreateParameter, + command_get_Parameters, + command_put_CommandType, + command_get_CommandType, + command_get_Name, + command_put_Name, + command_get_State, + command_Cancel, + command_putref_CommandStream, + command_get_CommandStream, + command_put_Dialect, + command_get_Dialect, + command_put_NamedParameters, + command_get_NamedParameters +}; + +HRESULT Command_create( void **out ) +{ + struct command *command; + + TRACE("(%p)\n", out); + + *out = NULL; + + command = heap_alloc(sizeof(*command)); + if (!command) + return E_OUTOFMEMORY; + + command->Command_iface.lpVtbl = &command_vtbl; + command->ref = 1; + + *out = &command->Command_iface; + + return S_OK; +} diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 32ae252337..3115474b84 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -117,6 +117,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = msadocf_LockServer }; +static struct msadocf command_cf = { { &msadocf_vtbl }, Command_create }; static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; static struct msadocf stream_cf = { { &msadocf_vtbl }, Stream_create }; @@ -142,6 +143,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &stream_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Command )) + { + cf = &command_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index 5ede180240..51f8bd77db 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -18,6 +18,14 @@ #pragma makedep register +[ + threading(apartment), + progid("ADODB.Command.6.0"), + vi_progid("ADODB.Command"), + uuid(00000507-0000-0010-8000-00aa006d2ea4) +] +coclass Command { interface _Command; } + [ threading(apartment), progid("ADODB.Connection.6.0"), diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 7239e48b53..f6c60f0304 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -21,6 +21,7 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +HRESULT Command_create( void ** ) DECLSPEC_HIDDEN; HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 5a1813694b..7850c45231 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -444,6 +444,33 @@ if (0) /* Crashes on windows */ _Connection_Release(connection); } +static void test_Command(void) +{ + HRESULT hr; + _Command *command; + _ADO *ado; + Command15 *command15; + Command25 *command25; + + hr = CoCreateInstance(&CLSID_Command, NULL, CLSCTX_INPROC_SERVER, + &IID__Command, (void**)&command); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Command_QueryInterface(command, &IID__ADO, (void**)&ado); + ok( hr == S_OK, "got %08x\n", hr ); + _ADO_Release(ado); + + hr = _Command_QueryInterface(command, &IID_Command15, (void**)&command15); + ok( hr == S_OK, "got %08x\n", hr ); + Command15_Release(command15); + + hr = _Command_QueryInterface(command, &IID_Command25, (void**)&command25); + ok( hr == S_OK, "got %08x\n", hr ); + Command25_Release(command25); + + _Command_Release(command); +} + START_TEST(msado15) { CoInitialize( NULL ); @@ -451,5 +478,6 @@ START_TEST(msado15) test_Fields(); test_Recordset(); test_Stream(); + test_Command(); CoUninitialize(); } -- 2.17.1

2 1