November 2015 - Wine-Commits

Alistair Leslie-Hughes : hnetcfg: Add Dispatch support to interface INetFwOpenPorts.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 376fe634f52aa2d35455f4704eb1a3f39e52cf8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=376fe634f52aa2d35455f4704… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 08:43:05 2015 +1100 hnetcfg: Add Dispatch support to interface INetFwOpenPorts. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/apps.c | 1 + dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/port.c | 36 ++++++++++++++++++++++++++++-------- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index d21ed98..ea6d411 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -109,6 +109,7 @@ static REFIID tid_id[] = &IID_INetFwAuthorizedApplications, &IID_INetFwMgr, &IID_INetFwOpenPort, + &IID_INetFwOpenPorts, &IID_INetFwPolicy, &IID_INetFwProfile }; diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 6fe69d5..bb3f3aa 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -22,6 +22,7 @@ enum type_id INetFwAuthorizedApplications_tid, INetFwMgr_tid, INetFwOpenPort_tid, + INetFwOpenPorts_tid, INetFwPolicy_tid, INetFwProfile_tid, last_tid diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 4cc1ba6..f4c755b 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -439,8 +439,9 @@ static HRESULT WINAPI fw_ports_GetTypeInfoCount( { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_ports_GetTypeInfo( @@ -451,8 +452,8 @@ static HRESULT WINAPI fw_ports_GetTypeInfo( { fw_ports *This = impl_from_INetFwOpenPorts( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwOpenPorts_tid, ppTInfo ); } static HRESULT WINAPI fw_ports_GetIDsOfNames( @@ -464,9 +465,18 @@ static HRESULT WINAPI fw_ports_GetIDsOfNames( DISPID *rgDispId ) { fw_ports *This = impl_from_INetFwOpenPorts( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwOpenPorts_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_ports_Invoke( @@ -481,10 +491,20 @@ static HRESULT WINAPI fw_ports_Invoke( UINT *puArgErr ) { fw_ports *This = impl_from_INetFwOpenPorts( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwOpenPorts_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwOpenPorts_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_ports_get_Count(

1 0

Austin English : ntoskrnl.exe: Add ExReleaseResourceForThreadLite stub.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: d8d759af5bba6d22c7cc3ee4f18fc3ebe4503eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d759af5bba6d22c7cc3ee4f… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 8 23:34:58 2015 -0600 ntoskrnl.exe: Add ExReleaseResourceForThreadLite stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 87abc21..78cc13b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2322,6 +2322,14 @@ PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lo } /*********************************************************************** + * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) + */ +void WINAPI ExReleaseResourceForThreadLite( PERESOURCE resource, ERESOURCE_THREAD tid ) +{ + FIXME( "stub: %p %lu\n", resource, tid ); +} + +/*********************************************************************** * KeEnterCriticalRegion (NTOSKRNL.EXE.@) */ void WINAPI KeEnterCriticalRegion(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6d22c8f..0f8f3ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -168,7 +168,7 @@ @ stub ExRaiseStatus @ stub ExRegisterCallback @ stub ExReinitializeResourceLite -@ stub ExReleaseResourceForThreadLite +@ stdcall ExReleaseResourceForThreadLite(ptr long) @ stub ExSemaphoreObjectType @ stub ExSetResourceOwnerPointer @ stub ExSetTimerResolution diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 7648161..e79d18e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -32,6 +32,9 @@ typedef LONG KPRIORITY; typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; +typedef ULONG_PTR ERESOURCE_THREAD; +typedef ERESOURCE_THREAD *PERESOURCE_THREAD; + struct _KDPC; struct _KAPC; struct _IRP;

1 0

Hans Leidekker : webservices: Implement WsWriteEndAttribute.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 112e1af5f15bb72fcfdbe5508cef7ed3008e6e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=112e1af5f15bb72fcfdbe5508… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:07 2015 +0100 webservices: Implement WsWriteEndAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c92588b..8189768 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -171,7 +171,7 @@ @ stub WsWriteChars @ stub WsWriteCharsUtf8 @ stub WsWriteElement -@ stub WsWriteEndAttribute +@ stdcall WsWriteEndAttribute(ptr ptr) @ stub WsWriteEndCData @ stdcall WsWriteEndElement(ptr ptr) @ stdcall WsWriteEndStartElement(ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index a9ff761..59a2859 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -566,6 +566,23 @@ static HRESULT write_endelement( struct writer *writer ) } /************************************************************************** + * WsWriteEndAttribute [webservices.@] + */ +HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + if (writer->state != WRITER_STATE_STARTATTRIBUTE) return WS_E_INVALID_OPERATION; + + writer->state = WRITER_STATE_STARTELEMENT; + return S_OK; +} + +/************************************************************************** * WsWriteEndElement [webservices.@] */ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error )

1 0

Hans Leidekker : webservices: Implement WsWriteEndElement.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: c08fb1a21123a15d98d140ef042018a20d2a71a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08fb1a21123a15d98d140ef0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:02 2015 +0100 webservices: Implement WsWriteEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 69 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index f0516d1..1d811ae 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -173,7 +173,7 @@ @ stub WsWriteElement @ stub WsWriteEndAttribute @ stub WsWriteEndCData -@ stub WsWriteEndElement +@ stdcall WsWriteEndElement(ptr ptr) @ stub WsWriteEndStartElement @ stub WsWriteEnvelopeEnd @ stub WsWriteEnvelopeStart diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b56c718..f55f56e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -520,6 +520,75 @@ static HRESULT write_startelement( struct writer *writer ) return S_OK; } +static HRESULT write_endelement( struct writer *writer ) +{ + WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)writer->current; + ULONG size; + HRESULT hr; + + /* '</prefix:localname>' */ + + size = elem->localName->length + 3 /* '</>' */; + if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; + if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; + + write_char( writer, '<' ); + write_char( writer, '/' ); + if (elem->prefix) + { + write_bytes( writer, elem->prefix->bytes, elem->prefix->length ); + write_char( writer, ':' ); + } + write_bytes( writer, elem->localName->bytes, elem->localName->length ); + write_char( writer, '>' ); + return S_OK; +} + +/************************************************************************** + * WsWriteEndElement [webservices.@] + */ +HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + if (writer->state == WRITER_STATE_STARTELEMENT) + { + /* '/>' */ + if ((hr = write_startelement( writer )) != S_OK) return hr; + if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; + write_char( writer, '/' ); + write_char( writer, '>' ); + + writer->current = writer->current->parent; + writer->state = WRITER_STATE_STARTENDELEMENT; + return S_OK; + } + else + { + struct node *node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ); + if (!node) return E_OUTOFMEMORY; + + /* '</prefix:localname>' */ + if ((hr = write_endelement( writer )) != S_OK) + { + free_node( node ); + return hr; + } + + write_insert_node( writer, node ); + writer->current = node->parent; + writer->state = WRITER_STATE_ENDELEMENT; + return S_OK; + } + return WS_E_INVALID_OPERATION; +} + /************************************************************************** * WsWriteStartElement [webservices.@] */

1 0

Andrew Eikum : winecoreaudio: Handle sysex MIDI messages.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 387fbdc7a164f5bdaba7a26a5da7a68fe7c39efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=387fbdc7a164f5bdaba7a26a5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 10 13:55:41 2015 -0600 winecoreaudio: Handle sysex MIDI messages. Originally submitted by "tinez <tinez(a)tlen.pl>". Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/midi.c | 68 ++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 8593e9c..a40ca2a 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -437,9 +437,8 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_ERROR; } } - else - { - FIXME("MOD_MIDIPORT\n"); + else if (destinations[wDevID].caps.wTechnology == MOD_MIDIPORT) { + MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, lpData, lpMidiHdr->dwBufferLength); } lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; @@ -822,6 +821,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD DWORD sendData = 0; int pos = 0; DWORD currentTime; + BOOL sysexStart; switch (msgid) { @@ -836,26 +836,55 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD if (src->state < 1) { TRACE("input not started, thrown away\n"); - goto done; - } - /* FIXME skipping SysEx */ - if (msg->data[0] == 0xF0) - { - FIXME("Starting System Exclusive\n"); - src->state |= 2; + return NULL; } - if (src->state & 2) - { - for (i = 0; i < msg->length; ++i) - { - if (msg->data[i] == 0xF7) - { - FIXME("Ending System Exclusive\n"); - src->state &= ~2; + + sysexStart = (msg->data[0] == 0xF0); + + if (sysexStart || src->state & 2) { + int pos = 0; + int len = msg->length; + + if (sysexStart) { + TRACE("Receiving sysex message\n"); + src->state |= 2; + } + + EnterCriticalSection(&midiInLock); + currentTime = GetTickCount() - src->startTime; + + while (len) { + LPMIDIHDR lpMidiHdr = src->lpQueueHdr; + + if (lpMidiHdr != NULL) { + int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); + memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, msg->data + pos, copylen); + lpMidiHdr->dwBytesRecorded += copylen; + len -= copylen; + pos += copylen; + + TRACE("Copied %d bytes of sysex message\n", copylen); + + if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || + (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { + TRACE("Sysex message complete (or buffer limit reached), dispatching %d bytes\n", lpMidiHdr->dwBytesRecorded); + src->lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(msg->devID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, currentTime); + src->state &= ~2; + } + } + else { + FIXME("Sysex data received but no buffer to store it!\n"); + break; } } - goto done; + + LeaveCriticalSection(&midiInLock); + return NULL; } + EnterCriticalSection(&midiInLock); currentTime = GetTickCount() - src->startTime; @@ -889,7 +918,6 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD CFRunLoopStop(CFRunLoopGetCurrent()); break; } -done: return NULL; }

1 0

Sebastian Lackner : server: Return STATUS_CANNOT_DELETE when trying to open readonly file with FILE_DELETE_ON_CLOSE.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 4857f95803bc23a17c2d1d284701a74140d3e005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4857f95803bc23a17c2d1d284… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 11 01:21:41 2015 +0100 server: Return STATUS_CANNOT_DELETE when trying to open readonly file with FILE_DELETE_ON_CLOSE. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ---- server/fd.c | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 643054f..91abb03 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -361,16 +361,12 @@ static void test__lcreat( void ) status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); - todo_wine ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); - if (!status) CloseHandle( file ); status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_DIRECTORY_FILE, NULL, 0 ); - todo_wine ok( status == STATUS_NOT_A_DIRECTORY, "expected STATUS_NOT_A_DIRECTORY, got %08x\n", status ); - if (!status) CloseHandle( file ); status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, diff --git a/server/fd.c b/server/fd.c index fe778f1..e3fe292 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1850,6 +1850,15 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, set_error( err ); goto error; } + + /* can't unlink files if we don't have permission to access */ + if ((options & FILE_DELETE_ON_CLOSE) && !(flags & O_CREAT) && + !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + { + set_error( STATUS_CANNOT_DELETE ); + goto error; + } + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; if (flags & O_TRUNC) {

1 0

Sebastian Lackner : kernel32/tests: Add some more tests for opening a file with FILE_DELETE_ON_CLOSE.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: c74bb13d2ea6a0d36d963e3b1a3386e10edd0afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74bb13d2ea6a0d36d963e3b1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 11 01:21:28 2015 +0100 kernel32/tests: Add some more tests for opening a file with FILE_DELETE_ON_CLOSE. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ca49863..643054f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -365,6 +365,20 @@ static void test__lcreat( void ) ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); if (!status) CloseHandle( file ); + status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_DIRECTORY_FILE, NULL, 0 ); + todo_wine + ok( status == STATUS_NOT_A_DIRECTORY, "expected STATUS_NOT_A_DIRECTORY, got %08x\n", status ); + if (!status) CloseHandle( file ); + + status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN_IF, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + todo_wine + ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); + if (!status) CloseHandle( file ); + RtlFreeUnicodeString( &filenameW ); todo_wine

1 0

Sebastian Lackner : ntdll: Fix specfile entry for NtCreateKeyTransacted.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: f0f248913f8c91dea774f1c9ee23a21325368d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f248913f8c91dea774f1c9e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 10 23:08:34 2015 +0100 ntdll: Fix specfile entry for NtCreateKeyTransacted. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d285561..c3b6bf0 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -130,7 +130,7 @@ @ stdcall NtCreateJobObject(ptr long ptr) # @ stub NtCreateJobSet @ stdcall NtCreateKey(ptr long ptr long ptr long long) -@ stdcall NtCreateKeyTransacted(ptr long ptr long ptr long long long) +@ stdcall NtCreateKeyTransacted(ptr long ptr long ptr long long ptr) @ stdcall NtCreateKeyedEvent(ptr long ptr long) @ stdcall NtCreateMailslotFile(long long long long long long long long) @ stdcall NtCreateMutant(ptr long ptr long) @@ -1050,7 +1050,7 @@ @ stdcall ZwCreateJobObject(ptr long ptr) NtCreateJobObject # @ stub ZwCreateJobSet @ stdcall ZwCreateKey(ptr long ptr long ptr long long) NtCreateKey -@ stdcall ZwCreateKeyTransacted(ptr long ptr long ptr long long long) NtCreateKeyTransacted +@ stdcall ZwCreateKeyTransacted(ptr long ptr long ptr long long ptr) NtCreateKeyTransacted @ stdcall ZwCreateKeyedEvent(ptr long ptr long) NtCreateKeyedEvent @ stdcall ZwCreateMailslotFile(long long long long long long long long) NtCreateMailslotFile @ stdcall ZwCreateMutant(ptr long ptr long) NtCreateMutant

1 0

Nikolay Sivov : mshtml: Make it clear that ATTR_FIX_PX and ATTR_FIX_URL as exclusive (Coverity).
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 8dd3f7d8c4afc03a94635457184287e9a1f0f4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd3f7d8c4afc03a946354571… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 22:31:29 2015 +0300 mshtml: Make it clear that ATTR_FIX_PX and ATTR_FIX_URL as exclusive (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 33318ff..d0953f2 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -405,7 +405,7 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, cons if(value) { if(flags & ATTR_FIX_PX) val = fix_px_value(value); - if(flags & ATTR_FIX_URL) + else if(flags & ATTR_FIX_URL) val = fix_url_value(value); }

1 0

Nikolay Sivov : winemine: Fix loading program state from registry.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 136d6755de498e0c2417738a8801570d14ca4292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136d6755de498e0c2417738a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 21:38:15 2015 +0300 winemine: Fix loading program state from registry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 7ccae07..706e208 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -80,38 +80,31 @@ static void LoadBoard( BOARD *p_board ) RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( !RegQueryValueExW( hkey, xposW, NULL, &type, - (LPBYTE) &p_board->pos.x, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( !RegQueryValueExW( hkey, yposW, NULL, &type, - (LPBYTE) &p_board->pos.y, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( !RegQueryValueExW( hkey, heightW, NULL, &type, - (LPBYTE) &p_board->rows, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( !RegQueryValueExW( hkey, widthW, NULL, &type, - (LPBYTE) &p_board->cols, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( !RegQueryValueExW( hkey, minesW, NULL, &type, - (LPBYTE) &p_board->mines, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( !RegQueryValueExW( hkey, difficultyW, NULL, &type, - (LPBYTE) &p_board->difficulty, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( !RegQueryValueExW( hkey, markW, NULL, &type, - (LPBYTE) &p_board->IsMarkQ, &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { @@ -127,8 +120,7 @@ static void LoadBoard( BOARD *p_board ) for( i = 0; i < 3; i++ ) { wsprintfW( key_name, timeW, i+1 ); size = sizeof( p_board->best_time[i] ); - if( !RegQueryValueExW( hkey, key_name, NULL, &type, - (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS ) + if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) ) p_board->best_time[i] = 999; } RegCloseKey( hkey );

1 0