October 2015 - Wine-commits

Gerald Pfeifer : d3d9: Make D3DFVF_TEXTUREFORMAT4 and friends unsigned.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 75d62d24d1ac83838dda22476309670e3ef27e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d62d24d1ac83838dda22476… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 27 12:07:00 2015 +0100 d3d9: Make D3DFVF_TEXTUREFORMAT4 and friends unsigned. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 111d242..cec42ec 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -60,10 +60,10 @@ #define D3DCS_PLANE5 __MSABI_LONG(0x800) #define D3DCS_ALL __MSABI_LONG(0xFFF) -#define D3DFVF_TEXTUREFORMAT1 3 -#define D3DFVF_TEXTUREFORMAT2 0 -#define D3DFVF_TEXTUREFORMAT3 1 -#define D3DFVF_TEXTUREFORMAT4 2 +#define D3DFVF_TEXTUREFORMAT1 3u +#define D3DFVF_TEXTUREFORMAT2 0u +#define D3DFVF_TEXTUREFORMAT3 1u +#define D3DFVF_TEXTUREFORMAT4 2u #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE2(CoordIndex) (D3DFVF_TEXTUREFORMAT2) #define D3DFVF_TEXCOORDSIZE3(CoordIndex) (D3DFVF_TEXTUREFORMAT3 << (CoordIndex*2 + 16))

1 0

Michael Stefaniuc : kernel32/tests: Simplify an ok() condition (PVS-Studio ).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: bcff50a9d476a03b93e21577d76288833900e39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcff50a9d476a03b93e21577d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 28 11:21:13 2015 +0100 kernel32/tests: Simplify an ok() condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index cbd276b..97ec794 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -941,7 +941,8 @@ static void test_waittxempty(void) evtmask = 0; SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); - ok((!res && GetLastError() == ERROR_IO_PENDING) || res /* busy system */, "%d: WaitCommEvent error %d\n", i, GetLastError()); + ok(res /* busy system */ || GetLastError() == ERROR_IO_PENDING, + "%d: WaitCommEvent error %d\n", i, GetLastError()); res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); if (i == 0)

1 0

Michael Stefaniuc : rsaenh/tests: Mark an old behavior as broken ( PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 899207b6c9ac8193467de068a98b6aba5ecefdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899207b6c9ac8193467de068a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 28 11:22:37 2015 +0100 rsaenh/tests: Mark an old behavior as broken (PVS-Studio). All newer Windows support salt in their AES provider. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 439d253..b7616fc 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1166,8 +1166,8 @@ static void test_aes(int keylen) /* Does AES provider support salt? */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, - "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + todo_wine ok(result || broken(GetLastError() == NTE_BAD_KEY), /* Vista or older */ + "Expected OK, got last error %d\n", GetLastError()); if (result) ok(!dwLen, "unexpected salt length %d\n", dwLen);

1 0

Gerald Pfeifer : configure: Use the -Wshift-overflow= 2 compiler option if available.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: c4dee537c90b7011c5d406392a183be66df3569b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4dee537c90b7011c5d406392… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Oct 24 23:51:01 2015 +0200 configure: Use the -Wshift-overflow=2 compiler option if available. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index 139a32c..fd09324 100755 --- a/configure +++ b/configure @@ -14172,6 +14172,31 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 +$as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } +if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wshift-overflow=2" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wshift_overflow_2=yes +else + ac_cv_cflags__Wshift_overflow_2=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wshift_overflow_2" >&5 +$as_echo "$ac_cv_cflags__Wshift_overflow_2" >&6; } +if test "x$ac_cv_cflags__Wshift_overflow_2" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wshift-overflow=2" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } if ${ac_cv_cflags__Wstrict_prototypes+:} false; then : diff --git a/configure.ac b/configure.ac index c4ba1a3..3180407 100644 --- a/configure.ac +++ b/configure.ac @@ -1837,6 +1837,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter])

1 0

Nikolay Sivov : prntvpt: Remove export ordinals.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 24fff52c8f32941a62ca0076414b585025062057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fff52c8f32941a62ca00764… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 16:06:18 2015 +0300 prntvpt: Remove export ordinals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/prntvpt.spec | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 2f20d3c..246443e 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,27 +1,27 @@ -1 stdcall PTQuerySchemaVersionSupport(wstr ptr) -2 stub PTOpenProvider -3 stub PTOpenProviderEx -4 stub PTCloseProvider -5 stub BindPTProviderThunk -6 stub PTGetPrintCapabilities -7 stub PTMergeAndValidatePrintTicket -8 stub PTConvertPrintTicketToDevMode -9 stub PTConvertDevModeToPrintTicket -10 stub PTReleaseMemory -11 stub ConvertDevModeToPrintTicketThunk2 -12 stub ConvertDevModeToPrintTicketThunk -13 stub ConvertPrintTicketToDevModeThunk2 -14 stub ConvertPrintTicketToDevModeThunk -15 stub DllCanUnloadNow -16 stub DllGetClassObject -17 stdcall -private DllMain(long long ptr) -18 stub DllRegisterServer -19 stub DllUnregisterServer -20 stub GetDeviceDefaultPrintTicketThunk -21 stub GetDeviceNamespacesThunk -22 stub GetPrintCapabilitiesThunk2 -23 stub GetPrintCapabilitiesThunk -24 stub GetSchemaVersionThunk -25 stub MergeAndValidatePrintTicketThunk2 -26 stub MergeAndValidatePrintTicketThunk -27 stub UnbindPTProviderThunk +@ stdcall PTQuerySchemaVersionSupport(wstr ptr) +@ stub PTOpenProvider +@ stub PTOpenProviderEx +@ stub PTCloseProvider +@ stub BindPTProviderThunk +@ stub PTGetPrintCapabilities +@ stub PTMergeAndValidatePrintTicket +@ stub PTConvertPrintTicketToDevMode +@ stub PTConvertDevModeToPrintTicket +@ stub PTReleaseMemory +@ stub ConvertDevModeToPrintTicketThunk2 +@ stub ConvertDevModeToPrintTicketThunk +@ stub ConvertPrintTicketToDevModeThunk2 +@ stub ConvertPrintTicketToDevModeThunk +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stdcall -private DllMain(long long ptr) +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub GetDeviceDefaultPrintTicketThunk +@ stub GetDeviceNamespacesThunk +@ stub GetPrintCapabilitiesThunk2 +@ stub GetPrintCapabilitiesThunk +@ stub GetSchemaVersionThunk +@ stub MergeAndValidatePrintTicketThunk2 +@ stub MergeAndValidatePrintTicketThunk +@ stub UnbindPTProviderThunk

1 0

Nikolay Sivov : prntvpt: Added PTOpenProvider() stub.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 577a75d76427eb367b1acdd004d76704beb3081d URL: http://source.winehq.org/git/wine.git/?a=commit;h=577a75d76427eb367b1acdd00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 16:06:19 2015 +0300 prntvpt: Added PTOpenProvider() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 7 +++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/Makefile.in | 1 + include/prntvpt.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index aa01252..72b1dcf 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "prntvpt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); @@ -48,3 +49,9 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) FIXME("stub:%s %p\n", debugstr_w(printer), version); return E_NOTIMPL; } + +HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) +{ + FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 246443e..bf9a8ca 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,5 +1,5 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) -@ stub PTOpenProvider +@ stdcall PTOpenProvider(wstr long ptr) @ stub PTOpenProviderEx @ stub PTCloseProvider @ stub BindPTProviderThunk diff --git a/include/Makefile.in b/include/Makefile.in index 1d4196e..3836af2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -514,6 +514,7 @@ SRCDIR_INCLUDES = \ pktdef.h \ poppack.h \ powrprof.h \ + prntvpt.h \ profinfo.h \ propkey.h \ propkeydef.h \ diff --git a/include/prntvpt.h b/include/prntvpt.h new file mode 100644 index 0000000..55ecbbe --- /dev/null +++ b/include/prntvpt.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2015 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#ifndef _PRNPTNTV_H_ +#define _PRNPTNTV_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(HPTPROVIDER); + +HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); + +#ifdef __cplusplus +} +#endif + +#endif /* _PRNPTNTV_H_ */

1 0

Nikolay Sivov : gdiplus: Added GdipBitmapConvertFormat stub.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: c820139b0f8f3099cffbdd39e5bac6cf642f018e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c820139b0f8f3099cffbdd39e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 22:07:02 2015 +0300 gdiplus: Added GdipBitmapConvertFormat stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 ++++++++++ include/gdipluspixelformats.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index edf4e45..9f7ce5f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -620,7 +620,7 @@ 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stub GdipBitmapGetHistogram 622 stub GdipBitmapGetHistogramSize -623 stub GdipBitmapConvertFormat +623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort 626 stub GdipDrawImageFX diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0a8027a..6725de8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5268,3 +5268,13 @@ GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) FIXME("(%p, %p): stub\n", image, pabort); return NotImplemented; } + +/***************************************************************************** + * GdipBitmapConvertFormat [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format, DitherType dithertype, + PaletteType palettetype, ColorPalette *palette, REAL alphathreshold) +{ + FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold); + return NotImplemented; +} diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index 9922b24..2a2a3cc 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -102,4 +102,33 @@ typedef struct ColorPalette #endif /* end of c typedefs */ +typedef enum DitherType +{ + DitherTypeNone, + DitherTypeSolid, + DitherTypeOrdered4x4, + DitherTypeOrdered8x8, + DitherTypeOrdered16x16, + DitherTypeSpiral4x4, + DitherTypeSpiral8x8, + DitherTypeDualSpiral4x4, + DitherTypeDualSpiral8x8, + DitherTypeErrorDiffusion, + DitherTypeMax +} DitherType; + +typedef enum PaletteType +{ + PaletteTypeCustom, + PaletteTypeOptimal, + PaletteTypeFixedBW, + PaletteTypeFixedHalftone8, + PaletteTypeFixedHalftone27, + PaletteTypeFixedHalftone64, + PaletteTypeFixedHalftone125, + PaletteTypeFixedHalftone216, + PaletteTypeFixedHalftone252, + PaletteTypeFixedHalftone256 +} PaletteType; + #endif

1 0

Huw Davies : oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal ().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 9ed47775d6a789f0c397c622279ab861a3e8425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed47775d6a789f0c397c6222… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:30 2015 +0000 oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal(). The code has already called VariantClear() which has released the interface yet not set it to NULL. This is to prevent a double-release after a forthcoming patch to WdtpInterfacePointer_UserUnmarshal(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 39a5f8c..303ec69 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -349,11 +349,12 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char * ptr = *(DWORD*)Buffer; Buffer += sizeof(DWORD); + /* Clear any existing interface which WdtpInterfacePointer_UserUnmarshal() + would try to release. This has been done already with a VariantClear(). */ + *ppunk = NULL; + if(!ptr) - { - *ppunk = NULL; return Buffer; - } return WdtpInterfacePointer_UserUnmarshal(pFlags, Buffer, ppunk, riid); }

1 0

Huw Davies : ole32: WdtpInterfacePointer_UserUnmarshal() should release an interface if one is passed in.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 6aa797e66999780c306165d03a41e5061a12e9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa797e66999780c306165d03… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:31 2015 +0000 ole32: WdtpInterfacePointer_UserUnmarshal() should release an interface if one is passed in. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 32 ++++++++++++++++++++++++-------- dlls/ole32/usrmarshal.c | 4 ++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 23cb910..756e820 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -563,13 +563,14 @@ static const IStreamVtbl TestStream_Vtbl = }; static TestUnknown Test_Unknown = { {&TestUnknown_Vtbl}, 1 }; +static TestUnknown Test_Unknown2 = { {&TestUnknown_Vtbl}, 1 }; static IStream Test_Stream = { &TestStream_Vtbl }; ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsigned char *, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserUnmarshal(ULONG *, unsigned char *, IUnknown **, REFIID); -static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) +static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx, BOOL client, BOOL in, BOOL out) { USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; @@ -638,11 +639,17 @@ todo_wine CoReleaseMarshalData(stm); IStream_Release(stm); - unk2 = NULL; + Test_Unknown2.refs = 1; + unk2 = &Test_Unknown2.IUnknown_iface; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); + umcb.pStubMsg->IsClient = client; + umcb.pStubMsg->fIsIn = in; + umcb.pStubMsg->fIsOut = out; + WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); + ok(Test_Unknown2.refs == 0, "got %d\n", Test_Unknown2.refs); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); IUnknown_Release(unk2); @@ -657,14 +664,23 @@ static void test_marshal_WdtpInterfacePointer(void) */ /* All three are marshalled as inproc */ - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_INPROC); - marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC); - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_INPROC, 0xffff)); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_INPROC, 0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_INPROC, 0xffff),0,0,0); /* All three are marshalled as remote */ - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE); - marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_DIFFERENTMACHINE); - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff)); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_DIFFERENTMACHINE,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff),0,0,0); + + /* Test different combinations of client, in and out */ + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,0,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,1,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,1,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,0,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,1,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,1,1); } static void test_marshal_STGMEDIUM(void) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index fe8ff4f..3184be6 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1490,6 +1490,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigne IStream *stm; DWORD size; void *ptr; + IUnknown *orig; TRACE("(%s, %p, %p, %s)\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); @@ -1517,11 +1518,14 @@ unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigne memcpy(ptr, pBuffer, size); GlobalUnlock(h); + orig = *ppunk; hr = CoUnmarshalInterface(stm, riid, (void**)ppunk); IStream_Release(stm); if(hr != S_OK) RaiseException(hr, 0, 0, NULL); + if(orig) IUnknown_Release(orig); + return pBuffer + size; }

1 0

Huw Davies : ole32/tests: Release the marshalled data in the expected buffers.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 9021b96772b31f54349bcae076910d2a2f2b5a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9021b96772b31f54349bcae07… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:32 2015 +0000 ole32/tests: Release the marshalled data in the expected buffers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 756e820..0ab4634 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -699,6 +699,8 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); expect_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 2 * sizeof(DWORD), unk, &IID_IUnknown); expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); + *(DWORD*)expect_buffer = TYMED_NULL; + *((DWORD*)expect_buffer + 1) = 0xdeadbeef; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 2 * sizeof(DWORD), unk, &IID_IUnknown); @@ -735,6 +737,14 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; + med2.pUnkForRelease = NULL; + STGMEDIUM_UserUnmarshal(&umcb.Flags, expect_buffer, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + HeapFree(GetProcessHeap(), 0, expect_buffer); /* TYMED_ISTREAM with pUnkForRelease */ @@ -746,6 +756,9 @@ static void test_marshal_STGMEDIUM(void) expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); /* There may be a hole between the two interfaces so init the buffer to something */ memset(expect_buffer, 0xcc, expect_size); + *(DWORD*)expect_buffer = TYMED_ISTREAM; + *((DWORD*)expect_buffer + 1) = 0xdeadbeef; + *((DWORD*)expect_buffer + 2) = 0xcafe; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 3 * sizeof(DWORD), (IUnknown*)stm, &IID_IStream); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer_end, unk, &IID_IUnknown); @@ -786,6 +799,14 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; + med2.pUnkForRelease = NULL; + STGMEDIUM_UserUnmarshal(&umcb.Flags, expect_buffer, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + HeapFree(GetProcessHeap(), 0, expect_buffer); }

1 0