July 2017 - Wine-commits - list.winehq.org

Francois Gouget : wsdapi: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 47c90af8d465a39ef05781747428066898271cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c90af8d465a39ef05781747… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:24:14 2017 +0200 wsdapi: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index e5ec8b1..dd07a5b 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -53,7 +53,7 @@ static inline IWSDUdpMessageParametersImpl *impl_from_IWSDUdpMessageParameters(I /* IWSDMessageParameters implementation */ -static ULONG WINAPI IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) +static ULONG IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) { IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -62,7 +62,7 @@ static ULONG WINAPI IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *ifac return ref; } -static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) +static ULONG IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) { IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -87,7 +87,7 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa return ref; } -static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +static HRESULT IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -109,7 +109,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParam return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +static HRESULT IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -131,7 +131,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParam return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +static HRESULT IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -153,7 +153,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessagePara return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +static HRESULT IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -175,7 +175,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessagePara return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) +static HRESULT IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) { FIXME("(%p, %p)\n", This, ppTxParams); return E_NOTIMPL;

1 0

Francois Gouget : advapi32/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 6e082ea86a4adb618b38309f55ec8994fcb16bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e082ea86a4adb618b38309f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:23:52 2017 +0200 advapi32/tests: A couple of spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3c68205..f71d45f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4034,7 +4034,7 @@ static void test_GetNamedSecurityInfoA(void) if (bret) admins_ace_id = i; } ok(users_ace_id != -1 || broken(users_ace_id == -1) /* win2k */, - "Bultin Users ACE not found.\n"); + "Builtin Users ACE not found.\n"); if (users_ace_id != -1) { bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); @@ -4051,7 +4051,7 @@ static void test_GetNamedSecurityInfoA(void) "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, GENERIC_READ); } - ok(admins_ace_id != -1, "Bultin Admins ACE not found.\n"); + ok(admins_ace_id != -1, "Builtin Admins ACE not found.\n"); if (admins_ace_id != -1) { bret = pGetAce(pDacl, admins_ace_id, (VOID **)&ace);

1 0

Francois Gouget : mapi32: A spelling fix in a comment.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: b0a31c3a3b65c38d36b4a1208f74a38a819771c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a31c3a3b65c38d36b4a1208… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:23:15 2017 +0200 mapi32: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index ce8ed80..0700e5c 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1635,7 +1635,7 @@ static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) * * PARAMS * iface [I] IMAPIProp object to get the property values from - * lpTags [I] Property tage of property values to be retrieved + * lpTags [I] Property tags of property values to be retrieved * ulFlags [I] Return 0=Ascii MAPI_UNICODE=Unicode strings for * unspecified types * lpCount [O] Destination for number of properties returned

1 0

Francois Gouget : ntdll/tests: A spelling fix in a comment.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: e3b1437e1b7db7d85f2967075924572c0872c6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b1437e1b7db7d85f2967075… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:22:39 2017 +0200 ntdll/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7176e44..a8412c5 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2121,7 +2121,7 @@ static void test_RtlLeaveCriticalSection(void) ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); /* - * Trying to leave a section that wasn't acquired modifies RecusionCount to an invalid value, + * Trying to leave a section that wasn't acquired modifies RecursionCount to an invalid value, * but doesn't modify LockCount so that an attempt to enter the section later will work. */ status = RtlLeaveCriticalSection(&cs);

1 0

Jacek Caban : server: Call create_irp from queue_irp.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 23dce6881b95f6b9e494aea1b418118035402bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dce6881b95f6b9e494aea1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:44 2017 +0200 server: Call create_irp from queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 47 +++++++++-------------------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/server/device.c b/server/device.c index 0443185..192395d 100644 --- a/server/device.c +++ b/server/device.c @@ -462,12 +462,15 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) } /* queue an irp to the device */ -static int queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) +static int queue_irp( struct device_file *file, const irp_params_t *params, struct async *async ) { - fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT ); + struct irp_call *irp = create_irp( file, params, async ); + if (!irp) return 0; + fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT ); irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file, irp, current ); + release_object( irp ); set_error( STATUS_PENDING ); return 1; } @@ -480,8 +483,6 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd ) static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); @@ -489,20 +490,12 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos params.read.key = 0; params.read.pos = pos; params.read.file = file->user_ptr; - - irp = create_irp( file, &params, async ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, async ); } static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); @@ -510,52 +503,30 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos params.write.key = 0; params.write.pos = pos; params.write.file = file->user_ptr; - - irp = create_irp( file, &params, async ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, async ); } static int device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; params.flush.file = file->user_ptr; - - irp = create_irp( file, &params, NULL ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, NULL ); } static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); params.ioctl.major = IRP_MJ_DEVICE_CONTROL; params.ioctl.code = code; params.ioctl.file = file->user_ptr; - - irp = create_irp( file, &params, async ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, async ); } static struct device *create_device( struct object *root, const struct unicode_str *name,

1 0

Alistair Leslie-Hughes : dmime: Rename IPersistStreamImpl_Load functions.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 9c949389f6d4c10b29c3da933babbca1d8d8a553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c949389f6d4c10b29c3da933… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 09:26:38 2017 +0000 dmime: Rename IPersistStreamImpl_Load functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 4 ++-- dlls/dmime/markertrack.c | 4 ++-- dlls/dmime/paramcontroltrack.c | 4 ++-- dlls/dmime/segment.c | 4 ++-- dlls/dmime/segtriggertrack.c | 4 ++-- dlls/dmime/seqtrack.c | 4 ++-- dlls/dmime/sysextrack.c | 4 ++-- dlls/dmime/tempotrack.c | 4 ++-- dlls/dmime/timesigtrack.c | 4 ++-- dlls/dmime/wavetrack.c | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 7038273..0800027 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + lyrics_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 852948a..32dd025 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -188,7 +188,7 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { IDirectMusicTrackImpl_Clone }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI marker_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -200,7 +200,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + marker_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index affea1d..1073399 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI param_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + param_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index ad8561f..f0e1482 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1171,7 +1171,7 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *pStm) { IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); HRESULT hr; @@ -1248,7 +1248,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + seg_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index d1b208a..5afe5b7 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -456,7 +456,7 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream *pStm) { IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK Chunk; @@ -505,7 +505,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + trigger_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 2d80db7..d15f159 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI track_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + track_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 431fca7..3715fe3 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI sys_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + sys_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 70de442..537845e 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -320,7 +320,7 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *pStm) { IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK Chunk; @@ -375,7 +375,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + tempo_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 9bd7450..74b2c36 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -189,7 +189,7 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -201,7 +201,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + time_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index bc6e3ca..c849f4c 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -249,7 +249,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -261,7 +261,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + wave_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax };

1 0

Alistair Leslie-Hughes : d2d1/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 4fc2dbb14a17ef61b1cb6832fb0cd00e071e9150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc2dbb14a17ef61b1cb6832f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:37:05 2017 +0000 d2d1/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0adeef4..e0318ce 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1111,9 +1111,8 @@ static void test_state_block(void) ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_DEFAULT, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2); - ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform); ok(!memcmp(&drawing_state.transform, &identity, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", @@ -1129,9 +1128,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_DEFAULT, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &identity, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21, @@ -1153,9 +1151,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21, @@ -1174,9 +1171,8 @@ static void test_state_block(void) ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2); - ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform); ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", @@ -1200,9 +1196,8 @@ static void test_state_block(void) ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2); - ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform); ok(!memcmp(&drawing_state.transform, &transform2, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", @@ -1218,9 +1213,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &transform2, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21, @@ -1241,9 +1235,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(drawing_state.tag1 == 3 && drawing_state.tag2 == 4, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 3 && drawing_state.tag2 == 4, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21,

1 0

Nikolay Sivov : regedit: Remove commented out block.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: d2697467b24c47a661cf6deaa0223fad795f1d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2697467b24c47a661cf6deaa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 5 15:15:01 2017 +0300 regedit: Remove commented out block. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index c59d435..dc3152d 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -429,18 +429,6 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR /* if (nmitem->hdr.hwndFrom != hWnd) break; unnecessary because of WM_NOTIFY_REFLECT */ /* if (nmitem->hdr.idFrom != IDW_LISTVIEW) break; */ /* if (nmitem->hdr.code != ???) break; */ -#ifdef _MSC_VER - switch (nmitem->uKeyFlags) { - case LVKF_ALT: /* The ALT key is pressed. */ - /* properties dialog box ? */ - break; - case LVKF_CONTROL: /* The CTRL key is pressed. */ - /* run dialog box for providing parameters... */ - break; - case LVKF_SHIFT: /* The SHIFT key is pressed. */ - break; - } -#endif info.pt.x = nmitem->ptAction.x; info.pt.y = nmitem->ptAction.y; if (SendMessageW(hWnd, LVM_HITTEST, 0, (LPARAM)&info) != -1) {

1 0

Hugh McMaster : regedit: Do not remove lines beginning with a semicolon from the read buffer.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 5cc1b227b77b84407a506914e90c857b20f8960d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc1b227b77b84407a506914e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 5 13:32:54 2017 +0000 regedit: Do not remove lines beginning with a semicolon from the read buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 92c30e9..74f0640 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -991,11 +991,6 @@ static WCHAR *get_lineA(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';') - { - line = next; - continue; - } lineW = GetWideString(line); return lineW; } @@ -1054,11 +1049,6 @@ static WCHAR *get_lineW(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';') - { - line = next; - continue; - } return line; }

1 0

Hugh McMaster : regedit: Check if any hex data exists before attempting to parse it.
by Alexandre Julliard 05 Jul '17

05 Jul '17

Module: wine Branch: master Commit: 1a4c3e5d287dd8debda28fcf77e7270338e502df URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4c3e5d287dd8debda28fcf7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 5 13:33:02 2017 +0000 regedit: Check if any hex data exists before attempting to parse it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 74f0640..e94d14e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -363,9 +363,12 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) WCHAR *end; DWORD val; + if (!**line) + return FALSE; + /* "hex(xx):" is special */ val = wcstoul(*line, &end, 16); - if (!**line || *end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) + if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) return FALSE; parser->data_type = val;

1 0