wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Jacek Caban : mshtml: Fixed 'adjacent' spelling.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 306cec23cb465632e67ade46c39cc2a92637dc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306cec23cb465632e67ade46c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:44:38 2013 +0100 mshtml: Fixed 'adjacent' spelling. --- dlls/mshtml/htmlelem2.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 16d5056..dc3ad7f 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1116,7 +1116,7 @@ static HRESULT WINAPI HTMLElement2_get_oncontextmenu(IHTMLElement2 *iface, VARIA return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_insertAdjecentElement(IHTMLElement2 *iface, BSTR where, +static HRESULT WINAPI HTMLElement2_insertAdjacentElement(IHTMLElement2 *iface, BSTR where, IHTMLElement *insertedElement, IHTMLElement **inserted) { HTMLElement *This = impl_from_IHTMLElement2(iface); @@ -1132,14 +1132,14 @@ static HRESULT WINAPI HTMLElement2_applyElement(IHTMLElement2 *iface, IHTMLEleme return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_getAdjecentText(IHTMLElement2 *iface, BSTR where, BSTR *text) +static HRESULT WINAPI HTMLElement2_getAdjacentText(IHTMLElement2 *iface, BSTR where, BSTR *text) { HTMLElement *This = impl_from_IHTMLElement2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(where), text); return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_replaceAdjecentText(IHTMLElement2 *iface, BSTR where, +static HRESULT WINAPI HTMLElement2_replaceAdjacentText(IHTMLElement2 *iface, BSTR where, BSTR newText, BSTR *oldText) { HTMLElement *This = impl_from_IHTMLElement2(iface); @@ -1348,10 +1348,10 @@ static const IHTMLElement2Vtbl HTMLElement2Vtbl = { HTMLElement2_mergeAttributes, HTMLElement2_put_oncontextmenu, HTMLElement2_get_oncontextmenu, - HTMLElement2_insertAdjecentElement, + HTMLElement2_insertAdjacentElement, HTMLElement2_applyElement, - HTMLElement2_getAdjecentText, - HTMLElement2_replaceAdjecentText, + HTMLElement2_getAdjacentText, + HTMLElement2_replaceAdjacentText, HTMLElement2_get_canHandleChildren, HTMLElement2_addBehavior, HTMLElement2_removeBehavior,

1 0

Piotr Caban : msvcrt: Fixed closing of FindFirstFile handle in build_expanded_argv.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: d622ffcba08f79631eecdb5f86cd2f04a0ddeab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d622ffcba08f79631eecdb5f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 14:31:41 2013 +0100 msvcrt: Fixed closing of FindFirstFile handle in build_expanded_argv. --- dlls/msvcrt/data.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index b31e5f7..80e023a 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -431,7 +431,7 @@ static int build_expanded_argv(int *argc, char **argv) args_no++; size += len+path_len; }while(FindNextFileA(h, &data)); - CloseHandle(h); + FindClose(h); } if(!len) { @@ -528,7 +528,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) args_no++; size += len+path_len; }while(FindNextFileW(h, &data)); - CloseHandle(h); + FindClose(h); } if(!len) {

1 0

Piotr Caban : cmd: Fixed memory leak in WCMD_run_program.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 743a42b25907c410069a2730831ff4d844c32b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743a42b25907c410069a27308… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 14:31:13 2013 +0100 cmd: Fixed memory leak in WCMD_run_program. --- programs/cmd/wcmdmain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ee64253..95f2995 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1213,6 +1213,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) Note: Launching internal wine processes cannot specify a full path to exe */ status = CreateProcessW(assumeInternal?NULL : thisDir, command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); + heap_free(st.lpReserved2); if ((opt_c || opt_k) && !opt_s && !status && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { /* strip first and last quote WCHARacters and try again */

1 0

Jacek Caban : mshtml: Fixed handling escaped paths in is_gecko_path.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 46827308158ad290806c099d03fcc89db4644566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46827308158ad290806c099d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 14:14:48 2013 +0100 mshtml: Fixed handling escaped paths in is_gecko_path. --- dlls/mshtml/nsembed.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 7691849..1613fe8 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shlobj.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -1106,12 +1107,14 @@ BOOL is_gecko_path(const char *path) if(!buf || strlenW(buf) < gecko_path_len) return FALSE; - buf[gecko_path_len] = 0; for(ptr = buf; *ptr; ptr++) { if(*ptr == '\\') *ptr = '/'; } + UrlUnescapeW(buf, NULL, NULL, URL_UNESCAPE_INPLACE); + buf[gecko_path_len] = 0; + ret = !strcmpiW(buf, gecko_path); heap_free(buf); return ret;

1 0

Jacek Caban : ieframe: Fixed tests on IE10.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 5068bdb6748534c2b7ccd7a8763643021cbf762e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5068bdb6748534c2b7ccd7a87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:40:07 2013 +0100 ieframe: Fixed tests on IE10. --- dlls/ieframe/tests/webbrowser.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 43f761b..39bc21d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -446,6 +446,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 69: /* TODO */ case 101: /* TODO (IE8) */ case 109: /* TODO (IE9) */ + case 113: /* TODO (IE10) */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -453,6 +454,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 105: /* TODO */ + case 134: /* TODO (IE10) */ + case 136: /* TODO (IE10) */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ @@ -950,6 +953,9 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe CHECK_EXPECT2(Invoke_282); break; + case 290: /* FIXME: IE10 */ + break; + default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); }

1 0

Jacek Caban : wininet: Renamed socketFD to socket.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: febbb85528a27be1da825537635fa11a5531e7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=febbb85528a27be1da8255376… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:16:17 2013 +0100 wininet: Renamed socketFD to socket. --- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 582599d..2dc1c6c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -89,8 +89,8 @@ BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct { + int socket; BOOL secure; - int socketFD; void *ssl_s; server_t *server; DWORD security_flags; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index dc47f2c..e423830 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -610,39 +610,39 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t int result, flag; assert(server->addr_len); - result = netconn->socketFD = socket(server->addr.ss_family, SOCK_STREAM, 0); + result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { flag = 1; - ioctlsocket(netconn->socketFD, FIONBIO, &flag); - result = connect(netconn->socketFD, (struct sockaddr*)&server->addr, server->addr_len); + ioctlsocket(netconn->socket, FIONBIO, &flag); + result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { if (sock_get_error(errno) == WSAEINPROGRESS) { struct pollfd pfd; int res; - pfd.fd = netconn->socketFD; + pfd.fd = netconn->socket; pfd.events = POLLOUT; res = poll(&pfd, 1, timeout); if (!res) { - closesocket(netconn->socketFD); + closesocket(netconn->socket); return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) { int err; socklen_t len = sizeof(err); - if (!getsockopt(netconn->socketFD, SOL_SOCKET, SO_ERROR, &err, &len) && !err) + if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, &err, &len) && !err) result = 0; } } } if(result == -1) - closesocket(netconn->socketFD); + closesocket(netconn->socket); else { flag = 0; - ioctlsocket(netconn->socketFD, FIONBIO, &flag); + ioctlsocket(netconn->socket, FIONBIO, &flag); } } if(result == -1) @@ -650,7 +650,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t #ifdef TCP_NODELAY flag = 1; - result = setsockopt(netconn->socketFD, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); + result = setsockopt(netconn->socket, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); if(result < 0) WARN("setsockopt(TCP_NODELAY) failed\n"); #endif @@ -681,7 +681,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(!netconn) return ERROR_OUTOFMEMORY; - netconn->socketFD = -1; + netconn->socket = -1; netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; list_init(&netconn->pool_entry); @@ -709,7 +709,7 @@ void free_netconn(netconn_t *netconn) } #endif - closesocket(netconn->socketFD); + closesocket(netconn->socket); heap_free(netconn); } @@ -823,7 +823,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) } pSSL_set_options(ssl_s, tls_option); - if (!pSSL_set_fd(ssl_s, connection->socketFD)) + if (!pSSL_set_fd(ssl_s, connection->socket)) { ERR("SSL_set_fd failed: %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -904,7 +904,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) /* fallback to connect without TLSv1.1/TLSv1.2 */ if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) { - closesocket(connection->socketFD); + closesocket(connection->socket); pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); res = create_netconn_socket(connection->server, connection, 500); if (res != ERROR_SUCCESS) @@ -928,7 +928,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, { if(!connection->secure) { - *sent = send(connection->socketFD, msg, len, flags); + *sent = send(connection->socket, msg, len, flags); if (*sent == -1) return sock_get_error(errno); return ERROR_SUCCESS; @@ -966,7 +966,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * if (!connection->secure) { - *recvd = recv(connection->socketFD, buf, len, flags); + *recvd = recv(connection->socket, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -1004,7 +1004,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { #ifdef FIONREAD int unread; - int retval = ioctlsocket(connection->socketFD, FIONREAD, &unread); + int retval = ioctlsocket(connection->socket, FIONREAD, &unread); if (!retval) { TRACE("%d bytes of queued, but unread data\n", unread); @@ -1030,7 +1030,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) ssize_t len; BYTE b; - len = recv(netconn->socketFD, &b, 1, MSG_PEEK|MSG_DONTWAIT); + len = recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && errno == EWOULDBLOCK); #elif defined(__MINGW32__) || defined(_MSC_VER) ULONG mode; @@ -1038,13 +1038,13 @@ BOOL NETCON_is_alive(netconn_t *netconn) char b; mode = 1; - if(!ioctlsocket(netconn->socketFD, FIONBIO, &mode)) + if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; - len = recv(netconn->socketFD, &b, 1, MSG_PEEK); + len = recv(netconn->socket, &b, 1, MSG_PEEK); mode = 0; - if(!ioctlsocket(netconn->socketFD, FIONBIO, &mode)) + if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; return len == 1 || (len == -1 && errno == WSAEWOULDBLOCK); @@ -1111,7 +1111,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) tv.tv_sec = value / 1000; tv.tv_usec = (value % 1000) * 1000; } - result = setsockopt(connection->socketFD, SOL_SOCKET, + result = setsockopt(connection->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv)); if (result == -1)

1 0

Jacek Caban : wininet: Renamed useSSL to secure and set it after secure connection is established .
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: c6ee6d6c9e1e200ed5155570dd368d9ca10ac7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ee6d6c9e1e200ed5155570d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:15:53 2013 +0100 wininet: Renamed useSSL to secure and set it after secure connection is established. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 861288d..468fee6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1968,7 +1968,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Flags |= IDSI_FLAG_KEEP_ALIVE; if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; - if (req->netconn->useSSL) + if (req->netconn->secure) info->Flags |= IDSI_FLAG_SECURE; return ERROR_SUCCESS; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6d08db1..582599d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -89,7 +89,7 @@ BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct { - BOOL useSSL; + BOOL secure; int socketFD; void *ssl_s; server_t *server; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4869d60..dc47f2c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -848,6 +848,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) } connection->ssl_s = ssl_s; + connection->secure = TRUE; bits = NETCON_GetCipherStrength(connection); if (bits >= 128) @@ -879,21 +880,20 @@ fail: DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { DWORD res = ERROR_NOT_SUPPORTED; -#ifdef SONAME_LIBSSL + /* can't connect if we are already connected */ - if (connection->ssl_s) - { + if(connection->secure) { ERR("already connected\n"); return ERROR_INTERNET_CANNOT_CONNECT; } - connection->useSSL = TRUE; if(server != connection->server) { server_release(connection->server); server_addref(server); connection->server = server; } +#ifdef SONAME_LIBSSL /* connect with given TLS options */ res = netcon_secure_connect_setup(connection, get_tls_option()); if (res == ERROR_SUCCESS) @@ -926,7 +926,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) { - if (!connection->useSSL) + if(!connection->secure) { *sent = send(connection->socketFD, msg, len, flags); if (*sent == -1) @@ -958,13 +958,13 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, - int *recvd /* out */) +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd) { *recvd = 0; if (!len) return ERROR_SUCCESS; - if (!connection->useSSL) + + if (!connection->secure) { *recvd = recv(connection->socketFD, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; @@ -1000,7 +1000,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { *available = 0; - if (!connection->useSSL) + if(!connection->secure) { #ifdef FIONREAD int unread;

1 0

Jörg Höhle : winmm: Prevent some MIDI race conditions.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: b0fc000ce1fef6067d921040965e055f5e09d926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc000ce1fef6067d9210409… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 23 09:47:27 2013 +0100 winmm: Prevent some MIDI race conditions. --- dlls/winealsa.drv/midi.c | 37 ++++++++++++++++--------------------- dlls/wineoss.drv/midi.c | 17 ++++++----------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 11b0f30..748fa79 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -389,9 +389,9 @@ static DWORD WINAPI midRecThread(LPVOID arg) * to handle the case where ALSA split the sysex into several events */ if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } } else { @@ -478,6 +478,16 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ERROR; } + MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + + MidiInDev[wDevID].lpQueueHdr = NULL; + MidiInDev[wDevID].dwTotalPlayed = 0; + MidiInDev[wDevID].bufsize = 0x3FFF; + MidiInDev[wDevID].midiDesc = *lpDesc; + MidiInDev[wDevID].state = 0; + MidiInDev[wDevID].incLen = 0; + MidiInDev[wDevID].startTime = 0; + /* Connect our app port to the device port */ if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; @@ -497,16 +507,6 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Created thread for midi-in\n"); } - MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; - MidiInDev[wDevID].midiDesc = *lpDesc; - MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].incLen = 0; - MidiInDev[wDevID].startTime = 0; - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; } @@ -644,12 +644,11 @@ static DWORD midReset(WORD wDevID) EnterCriticalSection(&crit_sect); while (MidiInDev[wDevID].lpQueueHdr) { - MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; - MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); - MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; + LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -726,10 +725,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) WARN("bad dwFlags\n"); return MMSYSERR_INVALFLAG; } - if (!MidiOutDev[wDevID].bEnabled) { - TRACE("disabled wDevID\n"); - return MMSYSERR_NOTENABLED; - } MidiOutDev[wDevID].lpExtra = 0; diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 2b3d433..bd013e1 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -563,9 +563,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } if (sbfb && lpMidiHdr != NULL) { lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -906,12 +906,11 @@ static DWORD midReset(WORD wDevID) EnterCriticalSection(&crit_sect); while (MidiInDev[wDevID].lpQueueHdr) { - MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; - MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); - MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; + LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -1102,10 +1101,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) WARN("bad dwFlags\n"); return MMSYSERR_INVALFLAG; } - if (!MidiOutDev[wDevID].bEnabled) { - TRACE("disabled wDevID\n"); - return MMSYSERR_NOTENABLED; - } MidiOutDev[wDevID].lpExtra = 0;

1 0

Jörg Höhle : wineoss: Add midi MTC Quarter Frame support (on output).
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 702fe6738b1091eb6f58735ed75e8c67d58f76f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702fe6738b1091eb6f58735ed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 26 11:18:36 2013 +0100 wineoss: Add midi MTC Quarter Frame support (on output). --- dlls/wineoss.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 11b7c91..2b3d433 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1445,7 +1445,6 @@ static DWORD modData(WORD wDevID, DWORD dwParam) switch (evt & 0x0F) { case 0x00: /* System Exclusive, don't do it on modData, * should require modLongData*/ - case 0x01: /* Undefined */ case 0x04: /* Undefined. */ case 0x05: /* Undefined. */ case 0x07: /* End of Exclusive. */ @@ -1470,6 +1469,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) SEQ_MIDIOUT(dev, 0x01); SEQ_MIDIOUT(dev, 0xf7); break; + case 0x01: /* MTC Quarter frame */ case 0x03: /* Song Select. */ SEQ_MIDIOUT(dev, evt); SEQ_MIDIOUT(dev, d1);

1 0

Jörg Höhle : winealsa: Reword some MIDI log messages.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 2bc23b0c55fc50a468959c8bc4334a2e15d1a98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc23b0c55fc50a468959c8bc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 19 20:43:09 2013 +0100 winealsa: Reword some MIDI log messages. --- dlls/winealsa.drv/midi.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ee975e3..11b0f30 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -118,9 +118,6 @@ static HANDLE hThread; * Low level MIDI implementation * *======================================================================*/ -static int midiOpenSeq(int); -static int midiCloseSeq(void); - #if 0 /* Debug Purpose */ static void error_handler(const char* file, int line, const char* function, int err, const char* fmt, ...) { @@ -246,21 +243,21 @@ static int midiOpenSeq(int create_client) if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); #else port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port created successfully (%d)\n", port_in); + TRACE("Input port %d created successfully\n", port_in); #endif } } @@ -413,7 +410,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) break; } if (toSend != 0) { - TRACE("Sending event %08x (from %d %d)\n", toSend, ev->source.client, ev->source.port); + TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); } } @@ -485,7 +482,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; - TRACE("input port connected %d %d %d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); + TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { end_thread = 0; @@ -761,8 +758,9 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; + TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); + MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - TRACE("Successful !\n"); return MMSYSERR_NOERROR; } @@ -999,7 +997,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); snd_seq_event_output_direct(midiSeq, &event); HeapFree(GetProcessHeap(), 0, lpNewData);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013