March 2013 - Wine-Commits - list.winehq.org

Piotr Caban : cmd: Fixed memory leak in WCMD_run_program.
by Alexandre Julliard March 1, 2013

March 1, 2013

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 : ieframe: Fixed tests on IE10.
by Alexandre Julliard March 1, 2013

March 1, 2013

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

Piotr Caban : msvcrt: Fixed closing of FindFirstFile handle in build_expanded_argv.
by Alexandre Julliard March 1, 2013

March 1, 2013

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

Jacek Caban : mshtml: Fixed handling escaped paths in is_gecko_path.
by Alexandre Julliard March 1, 2013

March 1, 2013

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 : mshtml: Fixed 'adjacent' spelling.
by Alexandre Julliard March 1, 2013

March 1, 2013

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

Jacek Caban : wininet: Renamed socketFD to socket.
by Alexandre Julliard March 1, 2013

March 1, 2013

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 March 1, 2013

March 1, 2013

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

Vincent Povirk : mscoree: Keep a reference to mscoree when shutting down.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 276d202e792d78c1298795fa72a95c47a182160a URL: http://source.winehq.org/git/wine.git/?a=commit;h=276d202e792d78c1298795fa7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 28 15:43:25 2013 -0600 mscoree: Keep a reference to mscoree when shutting down. --- dlls/mscoree/metahost.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 143494c..6906075 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -313,6 +313,12 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * void unload_all_runtimes(void) { int i; + HMODULE handle; + + /* If the only references to mscoree are through dll's that were loaded by + * Mono, shutting down the Mono runtime will free mscoree, so take a + * reference to prevent that from happening. */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&unload_all_runtimes, &handle); for (i=0; i<NUM_ABI_VERSIONS; i++) {

1 0

Dmitry Timoshkov : fonts: Add an initial version of Wingdings font.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 1b17f0fd5ded290a332260cad963dac53c08609f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b17f0fd5ded290a332260cad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 1 18:01:58 2013 +0900 fonts: Add an initial version of Wingdings font. This version contains just 3 glyphs which were copied from OpenSymbol font. --- fonts/Makefile.in | 3 +- fonts/wingding.sfd | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/wingding.ttf | Bin 0 -> 4332 bytes 3 files changed, 168 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 47fb8aa..0a9d7a7 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -54,7 +54,8 @@ TRUETYPE_FONTS = \ marlett.ttf \ symbol.ttf \ tahoma.ttf \ - tahomabd.ttf + tahomabd.ttf \ + wingding.ttf FONTS = $(BITMAP_FONTS) $(TRUETYPE_FONTS) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd new file mode 100644 index 0000000..33573e5 --- /dev/null +++ b/fonts/wingding.sfd @@ -0,0 +1,166 @@ +SplineFontDB: 3.0 +FontName: WineWingdings +FullName: Wingdings +FamilyName: Wingdings +Weight: Regular +Copyright: Copyright (C) 2013 Dmitry Timoshkov +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -170 +UnderlineWidth: 130 +Ascent: 1638 +Descent: 410 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +NeedsXUIDChange: 1 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "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.+AAoACgAA-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.+AAoACgAA-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+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 33 12 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 256 4 + +StartChar: f020 +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: ogonek +Encoding: 254 731 1 +Width: 1896 +Flags: W +LayerCount: 2 +Fore +SplineSet +1652 0 m 1,0,-1 + 172 0 l 1,1,-1 + 172 1482 l 1,2,-1 + 1600 1482 l 1,3,-1 + 1732 1560 l 1,4,-1 + 1768 1510 l 1,5,6 + 1729 1487 1729 1487 1652 1416 c 1,7,-1 + 1652 0 l 1,0,-1 +1506 1270 m 1,8,9 + 1113 841 1113 841 902 398 c 1,10,-1 + 700 252 l 1,11,12 + 565 696 565 696 390 768 c 1,13,14 + 489 882 489 882 588 882 c 0,15,16 + 674 882 674 882 790 602 c 1,17,18 + 976 917 976 917 1410 1336 c 1,19,-1 + 320 1336 l 1,20,-1 + 320 148 l 1,21,-1 + 1506 148 l 1,22,-1 + 1506 1270 l 1,8,9 +EndSplineSet +EndChar + +StartChar: registered +Encoding: 168 174 2 +Width: 1884 +Flags: W +LayerCount: 2 +Fore +SplineSet +322 148 m 1,0,-1 + 1506 148 l 1,1,-1 + 1506 1332 l 1,2,-1 + 322 1332 l 1,3,-1 + 322 148 l 1,0,-1 +172 0 m 1,4,-1 + 172 1480 l 1,5,-1 + 1652 1480 l 1,6,-1 + 1652 0 l 1,7,-1 + 172 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: G +Encoding: 71 71 3 +Width: 1581 +Flags: HW +LayerCount: 2 +Fore +SplineSet +446 -52 m 0,0,1 + 446 -119 446 -119 566 -150 c 0,2,3 + 647 -172 647 -172 744 -172 c 0,4,5 + 831 -172 831 -172 926 -142 c 0,6,7 + 1052 -103 1052 -103 1052 -40 c 0,8,9 + 1052 -9 1052 -9 1026 6 c 1,10,11 + 1021 -62 1021 -62 906 -96 c 0,12,13 + 824 -120 824 -120 730 -120 c 0,14,15 + 480 -120 480 -120 480 -6 c 1,16,17 + 446 -17 446 -17 446 -52 c 0,0,1 +408 428 m 0,18,19 + 408 347 408 347 504 162 c 1,20,-1 + 516 6 l 1,21,22 + 563 -70 563 -70 760 -70 c 0,23,24 + 868 -70 868 -70 912 -46 c 0,25,26 + 947 -24 947 -24 964 32 c 2,27,-1 + 1010 170 l 1,28,-1 + 1138 492 l 1,29,30 + 1137 665 1137 665 1082 928 c 0,31,32 + 1010 1268 1010 1268 910 1268 c 0,33,34 + 883 1268 883 1268 864 1226 c 0,35,36 + 848 1194 848 1194 848 1164 c 0,37,38 + 848 1087 848 1087 896 818 c 1,39,40 + 856 884 856 884 796 884 c 0,41,42 + 718 884 718 884 706 790 c 1,43,44 + 690 832 690 832 638 832 c 0,45,46 + 580 832 580 832 556 770 c 1,47,-1 + 526 776 l 2,48,49 + 408 776 408 776 408 428 c 0,18,19 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf new file mode 100644 index 0000000..0c963c0 Binary files /dev/null and b/fonts/wingding.ttf differ

1 0

Alessandro Pignotti : quartz: Use the moniker to create the filter directly .
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 1ebed65e924f1981601e56abe3997cbadb3aecc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebed65e924f1981601e56abe… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Sun Feb 24 23:13:45 2013 +0100 quartz: Use the moniker to create the filter directly. --- dlls/quartz/filtergraph.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 985e568..acd6dca 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1394,13 +1394,13 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) ULONG pin; hr = GetFilterInfo(pMoniker, &clsid, &var); - IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error; } - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); + hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr);

1 0