May 2015 - Wine-commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: f2988416ab4459af8d36d7cfc568a37bc6bc189e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2988416ab4459af8d36d7cfc… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 21 20:25:50 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index c93e7fa..f18df3e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-18 16:29+0300\n" +"PO-Revision-Date: 2015-05-21 20:22+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7453,10 +7453,8 @@ msgid "Add Control" msgstr "Pridėti valdiklį" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "Š&riftas..." +msgstr "&Konvertuoti..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9208,24 +9206,20 @@ msgstr "" "vietos diske, ar vis dar prisijungę prie tinklo." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "„Wine“ „Mono“ diegimo programa" +msgstr "„Wine“ garso susiejiklis" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "stulpelis" +msgstr "Garsumas" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Pagrindinis garsumas" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Nutildyti" #: winspool.rc:37 msgid "Print to File"

1 0

Alexandre Julliard : server: Create the null device and its symlink.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: c0ac2afb19ca6e5ad3999f47744b9210c22fa758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ac2afb19ca6e5ad3999f477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:19:51 2015 +0900 server: Create the null device and its symlink. --- dlls/ntdll/tests/om.c | 20 ++++++-------------- server/device.c | 16 ++++++++++++++++ server/directory.c | 11 ++++++++++- server/file.h | 7 +++++++ server/object.h | 4 ---- 5 files changed, 39 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0ac2afb19ca6e5ad3999…

1 0

Alexandre Julliard : kernel32: Check NT symlink first for all devices in QueryDosDeviceW.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: f32600d3c1ae47731b53b6a872c16c9d1d0a893d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f32600d3c1ae47731b53b6a87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:35:06 2015 +0900 kernel32: Check NT symlink first for all devices in QueryDosDeviceW. --- dlls/kernel32/volume.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 38a72c5..0bbf621 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1282,34 +1282,35 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) { WCHAR *p, name[5]; char *path, *link; + WCHAR *buffer; DWORD dosdev, ret = 0; if ((dosdev = RtlIsDosDeviceName_U( devname ))) { memcpy( name, devname + HIWORD(dosdev)/sizeof(WCHAR), LOWORD(dosdev) ); name[LOWORD(dosdev)/sizeof(WCHAR)] = 0; + devname = name; } - else - { - WCHAR *buffer; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(dosdevW) + strlenW(devname)*sizeof(WCHAR) ))) - { - SetLastError( ERROR_OUTOFMEMORY ); - return 0; - } - memcpy( buffer, dosdevW, sizeof(dosdevW) ); - strcatW( buffer, devname ); - status = read_nt_symlink( buffer, target, bufsize ); - HeapFree( GetProcessHeap(), 0, buffer ); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return 0; - } + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(dosdevW) + strlenW(devname)*sizeof(WCHAR) ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } + memcpy( buffer, dosdevW, sizeof(dosdevW) ); + strcatW( buffer, devname ); + status = read_nt_symlink( buffer, target, bufsize ); + HeapFree( GetProcessHeap(), 0, buffer ); + if (!status) + { ret = strlenW( target ) + 1; goto done; } + if (!dosdev) /* not a special DOS device */ + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } /* FIXME: should read NT symlink for all devices */ @@ -1322,7 +1323,7 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) ret = MultiByteToWideChar( CP_UNIXCP, 0, link, -1, target, bufsize ); HeapFree( GetProcessHeap(), 0, link ); } - else if (dosdev) /* look for device defaults */ + else /* look for device defaults */ { if (!strcmpiW( name, auxW )) {

1 0

Alexandre Julliard : kernel32: Get rid of the hardcoded NUL device in QueryDosDeviceW.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: c4fb1f617dbe15ce6fa1e5602de4ade764388b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4fb1f617dbe15ce6fa1e5602… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:35:59 2015 +0900 kernel32: Get rid of the hardcoded NUL device in QueryDosDeviceW. --- dlls/kernel32/volume.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 0bbf621..d06dd05 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1258,7 +1258,6 @@ BOOL WINAPI DefineDosDeviceA(DWORD flags, LPCSTR devname, LPCSTR targetpath) DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) { static const WCHAR auxW[] = {'A','U','X',0}; - static const WCHAR nulW[] = {'N','U','L',0}; static const WCHAR prnW[] = {'P','R','N',0}; static const WCHAR comW[] = {'C','O','M',0}; static const WCHAR lptW[] = {'L','P','T',0}; @@ -1376,7 +1375,7 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) WCHAR *p = target; int i; - if (bufsize <= (sizeof(auxW)+sizeof(nulW)+sizeof(prnW))/sizeof(WCHAR)) + if (bufsize <= (sizeof(auxW)+sizeof(prnW))/sizeof(WCHAR)) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); return 0; @@ -1386,8 +1385,6 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) memcpy( p, auxW, sizeof(auxW) ); p += sizeof(auxW) / sizeof(WCHAR); - memcpy( p, nulW, sizeof(nulW) ); - p += sizeof(nulW) / sizeof(WCHAR); memcpy( p, prnW, sizeof(prnW) ); p += sizeof(prnW) / sizeof(WCHAR);

1 0

Alexandre Julliard : ntdll: Add support for file I/O on device files.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 950c82094b34bec87b38e09fe4657df4eeeb0522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950c82094b34bec87b38e09fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:27:03 2015 +0900 ntdll: Add support for file I/O on device files. --- dlls/ntdll/file.c | 5 +++-- dlls/ntdll/tests/om.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 43e52c6..d081750 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -847,7 +847,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } } - else if (type == FD_TYPE_SERIAL) + else if (type == FD_TYPE_SERIAL || type == FD_TYPE_DEVICE) { if (async_read && (!offset || offset->QuadPart < 0)) { @@ -872,6 +872,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, { case FD_TYPE_FILE: case FD_TYPE_CHAR: + case FD_TYPE_DEVICE: status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; goto done; case FD_TYPE_SERIAL: @@ -1265,7 +1266,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } } - else if (type == FD_TYPE_SERIAL) + else if (type == FD_TYPE_SERIAL || type == FD_TYPE_DEVICE) { if (async_write && (!offset || (offset->QuadPart < 0 && offset->QuadPart != FILE_WRITE_TO_END_OF_FILE))) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index fa6f2c3..a7ac95f 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1063,14 +1063,14 @@ static void test_null_device(void) SetLastError(0xdeadbeef); ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL); - todo_wine ok(!ret, "WriteFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret, "WriteFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL); ok(!ret, "ReadFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); num_bytes = 0xdeadbeef; @@ -1102,7 +1102,7 @@ static void test_null_device(void) ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); ok(!ret, "GetOverlappedResult unexpectedly succeeded\n"); } - todo_wine ok(GetLastError() == ERROR_HANDLE_EOF, + ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %u\n", GetLastError()); pNtClose(null);

1 0

Alexandre Julliard : ntdll: Remove the special case for the NUL device.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: ee1528040e47b39591a39ee42b2a6587a653e00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1528040e47b39591a39ee42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:28:03 2015 +0900 ntdll: Remove the special case for the NUL device. --- dlls/ntdll/directory.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 1a8d9cc..8e4db83 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2734,12 +2734,6 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, ANSI_STRING *u strcpy( dev, "lpt1" ); continue; } - if (!strcmp( dev, "nul" )) - { - strcpy( unix_name, "/dev/null" ); - dev = NULL; /* last try */ - continue; - } new_name = NULL; if (dev[1] == ':' && dev[2] == ':') /* drive device */

1 0

Hans Leidekker : rpcrt4: Use InternetSetCookie to set the session cookie.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 852721863abc4b807a443aef3993dc4bd63403d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852721863abc4b807a443aef3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 21 10:46:44 2015 +0200 rpcrt4: Use InternetSetCookie to set the session cookie. This ensures that the cookie is preserved when the server sets an additional cookie. --- dlls/rpcrt4/rpc_transport.c | 85 +++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index a6438a7..c6bd21e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2873,30 +2873,6 @@ static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request return status; } -static RPC_STATUS insert_cookie_header(HINTERNET request, const WCHAR *value) -{ - static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; - WCHAR *header, *ptr; - int len; - RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; - - if (!value) return RPC_S_OK; - - len = strlenW(value); - if ((header = HeapAlloc(GetProcessHeap(), 0, sizeof(cookieW) + (len + 3) * sizeof(WCHAR)))) - { - memcpy(header, cookieW, sizeof(cookieW)); - ptr = header + sizeof(cookieW) / sizeof(cookieW[0]); - memcpy(ptr, value, len * sizeof(WCHAR)); - ptr[len++] = '\r'; - ptr[len++] = '\n'; - ptr[len] = 0; - if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD_IF_NEW))) status = RPC_S_OK; - HeapFree(GetProcessHeap(), 0, header); - } - return status; -} - static BOOL has_credentials(RpcConnection_http *httpc) { RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds; @@ -2922,6 +2898,51 @@ static BOOL is_secure(RpcConnection_http *httpc) (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL); } +static RPC_STATUS set_auth_cookie(RpcConnection_http *httpc, const WCHAR *value) +{ + static WCHAR httpW[] = {'h','t','t','p',0}; + static WCHAR httpsW[] = {'h','t','t','p','s',0}; + URL_COMPONENTSW uc; + DWORD len; + WCHAR *url; + BOOL ret; + + if (!value) return RPC_S_OK; + + uc.dwStructSize = sizeof(uc); + uc.lpszScheme = is_secure(httpc) ? httpsW : httpW; + uc.dwSchemeLength = 0; + uc.lpszHostName = httpc->servername; + uc.dwHostNameLength = 0; + uc.nPort = 0; + uc.lpszUserName = NULL; + uc.dwUserNameLength = 0; + uc.lpszPassword = NULL; + uc.dwPasswordLength = 0; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = 0; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; + + if (!InternetCreateUrlW(&uc, 0, NULL, &len) && (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + return RPC_S_SERVER_UNAVAILABLE; + + if (!(url = HeapAlloc(GetProcessHeap(), 0, len))) return RPC_S_OUT_OF_MEMORY; + + len = len / sizeof(WCHAR) - 1; + if (!InternetCreateUrlW(&uc, 0, url, &len)) + { + HeapFree(GetProcessHeap(), 0, url); + return RPC_S_SERVER_UNAVAILABLE; + } + + ret = InternetSetCookieW(url, NULL, value); + HeapFree(GetProcessHeap(), 0, url); + if (!ret) return RPC_S_SERVER_UNAVAILABLE; + + return RPC_S_OK; +} + static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) { RpcConnection_http *httpc = (RpcConnection_http *)Connection; @@ -2975,6 +2996,12 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) if (secure) flags |= INTERNET_FLAG_SECURE; if (credentials) flags |= INTERNET_FLAG_NO_AUTH; + status = set_auth_cookie(httpc, Connection->CookieAuth); + if (status != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, url); + return status; + } httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes, flags, (DWORD_PTR)httpc->async_data); if (!httpc->in_request) @@ -2983,12 +3010,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) HeapFree(GetProcessHeap(), 0, url); return RPC_S_SERVER_UNAVAILABLE; } - status = insert_cookie_header(httpc->in_request, Connection->CookieAuth); - if (status != RPC_S_OK) - { - HeapFree(GetProcessHeap(), 0, url); - return status; - } + if (credentials) { status = authorize_request(httpc, httpc->in_request); @@ -3014,9 +3036,6 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } - status = insert_cookie_header(httpc->out_request, Connection->CookieAuth); - if (status != RPC_S_OK) - return status; if (credentials) {

1 0

Hans Leidekker : rpcrt4: Initialize the association UUID in RpcAssoc_Alloc.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: ab6361fbbfd18747d89d8658a6ce05ade731453e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6361fbbfd18747d89d8658a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 21 10:47:08 2015 +0200 rpcrt4: Initialize the association UUID in RpcAssoc_Alloc. --- dlls/rpcrt4/rpc_assoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 170ca44..339ac12 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -80,6 +80,7 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, assoc->Endpoint = RPCRT4_strdupA(Endpoint); assoc->NetworkOptions = NetworkOptions ? RPCRT4_strdupW(NetworkOptions) : NULL; assoc->assoc_group_id = 0; + UuidCreate(&assoc->http_uuid); list_init(&assoc->entry); *assoc_out = assoc; return RPC_S_OK;

1 0

Hans Leidekker : rpcrt4: Remove a couple of unused assignments.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 0877e4cbb232f5024936ab990c3028ced1aa51ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0877e4cbb232f5024936ab990… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 21 10:47:32 2015 +0200 rpcrt4: Remove a couple of unused assignments. --- dlls/rpcrt4/rpc_transport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c6bd21e..8c0263b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2972,9 +2972,9 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) httpc->async_data->completion_event = CreateEventW(NULL, FALSE, FALSE, NULL); - status = UuidCreate(&httpc->connection_uuid); - status = UuidCreate(&httpc->in_pipe_uuid); - status = UuidCreate(&httpc->out_pipe_uuid); + UuidCreate(&httpc->connection_uuid); + UuidCreate(&httpc->in_pipe_uuid); + UuidCreate(&httpc->out_pipe_uuid); status = rpcrt4_http_internet_connect(httpc); if (status != RPC_S_OK)

1 0

Nikolay Sivov : riched20: Implement GetName() for ITextFont.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: e6e16eb6323fe7d4c52012df74221d2fcb18ab43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e16eb6323fe7d4c52012df7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 11:25:24 2015 +0300 riched20: Implement GetName() for ITextFont. --- dlls/riched20/richole.c | 41 +++++++++++++++++-- dlls/riched20/tests/richole.c | 93 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c9c75b8..215d326 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -213,7 +213,8 @@ static const DWORD textfont_prop_masks[] = { typedef union { FLOAT f; - LONG l; + LONG l; + BSTR str; } textfont_prop_val; static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, textfont_prop_val *left, @@ -230,6 +231,8 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te case FONT_SUPERSCRIPT: case FONT_UNDERLINE: return left->l == right->l; + case FONT_NAME: + return !strcmpW(left->str, right->str); case FONT_SIZE: return left->f == right->f; default: @@ -252,6 +255,9 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo case FONT_UNDERLINE: v->l = tomUndefined; return; + case FONT_NAME: + v->str = NULL; + return; case FONT_SIZE: v->f = tomUndefined; return; @@ -291,6 +297,12 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_LANGID: value->l = fmt.lcid; break; + case FONT_NAME: + /* this case is used exclusively by GetName() */ + value->str = SysAllocString(fmt.szFaceName); + if (!value->str) + return E_OUTOFMEMORY; + break; case FONT_SIZE: value->f = fmt.yHeight; break; @@ -1991,8 +2003,31 @@ static HRESULT WINAPI TextFont_SetLanguageID(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetName(ITextFont *iface, BSTR *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + const IRichEditOleImpl *reole; + textfont_prop_val v; + LONG start; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, value); + + if (!value) + return E_INVALIDARG; + + *value = NULL; + + ITextRange_QueryInterface(This->range, &IID_Igetrichole, (void**)&reole); + if (!reole) + return CO_E_RELEASED; + + init_textfont_prop_value(FONT_NAME, &v); + + ITextRange_GetStart(This->range, &start); + hr = get_textfont_prop_for_pos(reole, start, FONT_NAME, &v); + if (FAILED(hr)) + return hr; + + *value = v.str; + return S_OK; } static HRESULT WINAPI TextFont_SetName(ITextFont *iface, BSTR value) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a47d31f..042bef4 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -130,14 +130,12 @@ static void test_Interfaces(void) res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle); ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); - refcount = get_refcount((IUnknown *)reOle); - ok(refcount == 2, "got wrong ref count: %d\n", refcount); + EXPECT_REF(reOle, 2); res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle1); ok(res == 1, "SendMessage\n"); ok(reOle1 == reOle, "Should not return a new IRichEditOle interface\n"); - refcount = get_refcount((IUnknown *)reOle); - ok(refcount == 3, "got wrong ref count: %d\n", refcount); + EXPECT_REF(reOle, 3); hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument, (void **) &txtDoc); @@ -147,12 +145,21 @@ static void test_Interfaces(void) hres = ITextDocument_GetSelection(txtDoc, NULL); ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%x\n", hres); + EXPECT_REF(txtDoc, 4); + hres = ITextDocument_GetSelection(txtDoc, &txtSel); ok(hres == S_OK, "got 0x%08x\n", hres); + EXPECT_REF(txtDoc, 4); + EXPECT_REF(txtSel, 2); + hres = ITextDocument_GetSelection(txtDoc, &txtSel2); ok(hres == S_OK, "got 0x%08x\n", hres); ok(txtSel2 == txtSel, "got %p, %p\n", txtSel, txtSel2); + + EXPECT_REF(txtDoc, 4); + EXPECT_REF(txtSel, 3); + ITextSelection_Release(txtSel2); punk = NULL; @@ -1415,6 +1422,83 @@ todo_wine { release_interfaces(&hwnd, &reOle, &doc, NULL); } +static void test_ITextFont(void) +{ + static const WCHAR sysW[] = {'S','y','s','t','e','m',0}; + static const WCHAR arialW[] = {'A','r','i','a','l',0}; + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextRange *range = NULL; + ITextFont *font; + CHARFORMAT2A cf; + HRESULT hr; + HWND hwnd; + BOOL ret; + BSTR str; + + create_interfaces(&hwnd, &reOle, &doc, NULL); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + + hr = ITextDocument_Range(doc, 0, 10, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_GetFont(range, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_GetName(font, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* default font name */ + str = NULL; + hr = ITextFont_GetName(font, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* change font name for an inner subrange */ + memset(&cf, 0, sizeof(cf)); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_FACE; + strcpy(cf.szFaceName, "Arial"); + + SendMessageA(hwnd, EM_SETSEL, 3, 4); + ret = SendMessageA(hwnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + + /* still original name */ + str = NULL; + hr = ITextFont_GetName(font, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + SendMessageA(hwnd, EM_SETSEL, 1, 2); + ret = SendMessageA(hwnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + + str = NULL; + hr = ITextFont_GetName(font, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* name is returned for first position within a range */ + SendMessageA(hwnd, EM_SETSEL, 0, 1); + ret = SendMessageA(hwnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + + str = NULL; + hr = ITextFont_GetName(font, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, arialW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextFont_Release(font); + ITextRange_Release(range); + release_interfaces(&hwnd, &reOle, &doc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -1439,4 +1523,5 @@ START_TEST(richole) test_GetFont(); test_GetPara(); test_dispatch(); + test_ITextFont(); }

1 0