February 2016 - Wine-devel - list.winehq.org

Re: [PATCH] ntdll: Finish serial reads of size 0 immediately.
by Marvin 14 Feb '16

14 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20438 Your paranoid android. === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1520: Changing CommMask on the fly for handle 000000BC after timeout 500 === w7pro64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1513 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1513 ms for waiting

1 0

Re: [PATCH 2/2] wpcap: Fix crash on pcap_loop(try 3)
by Alexandre Julliard 14 Feb '16

14 Feb '16

André Hentschel <nerv(a)dawncrow.de> writes: > Am 12.02.2016 um 06:31 schrieb Jianqiu Zhang: >> From 12ecf0983d9355e3f1b4781645503cb4fb65e599 Mon Sep 17 00:00:00 2001 >> From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> >> Date: Tue, 5 Jan 2016 09:12:42 +0800 >> Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop >> > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Was there a reason you didn't use a simple stack variable originally? -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Nikolay Sivov 13 Feb '16

13 Feb '16

On 14.02.2016 2:19, Theodore Dubois wrote: > Basically, returns the correct value for > ASSOCSTR_FRIENDLYDOCNAME and ASSOCSTR_DEFAULTICON > when passed a ProgID instead of a file extension. > > Also adds some tests to make sure it works. > > Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> > --- > dlls/shell32/assoc.c | 146 +++++++++++++++++++++++++-------------------- > dlls/shell32/tests/assoc.c | 71 +++++++++++++++++++++- > 2 files changed, 151 insertions(+), 66 deletions(-) > > diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c > index 90d00a8..2667ffe 100644 > --- a/dlls/shell32/assoc.c > +++ b/dlls/shell32/assoc.c > @@ -63,6 +63,7 @@ typedef struct > LONG ref; > HKEY hkeySource; > HKEY hkeyProgID; > + LPWSTR pszAssocName; > } IQueryAssociationsImpl; Why do you need this? It's not used anywhere as far as I can tell. > > typedef struct > @@ -88,6 +89,8 @@ static inline struct enumassochandlers *impl_from_IEnumAssocHandlers(IEnumAssocH > return CONTAINING_RECORD(iface, struct enumassochandlers, IEnumAssocHandlers_iface); > } > > +static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size); > + > /************************************************************************** > * IQueryAssociations_QueryInterface > * > @@ -152,6 +155,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) > TRACE("Destroying IQueryAssociations (%p)\n", This); > RegCloseKey(This->hkeySource); > RegCloseKey(This->hkeyProgID); > + HeapFree(GetProcessHeap(), 0, (LPVOID)This->pszAssocName); > SHFree(This); > } No need for a cast. > > @@ -186,20 +190,30 @@ static HRESULT WINAPI IQueryAssociations_fnInit( > LONG ret; > > TRACE("(%p)->(%d,%s,%p,%p)\n", iface, > - cfFlags, > - debugstr_w(pszAssoc), > - hkeyProgid, > - hWnd); > + cfFlags, > + debugstr_w(pszAssoc), > + hkeyProgid, > + hWnd); No need for that either. > + > + This->pszAssocName = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszAssoc) + 10001) * sizeof(WCHAR)); Seriously? > - *data = HeapAlloc(GetProcessHeap(), 0, size); > + *data = HeapAlloc(GetProcessHeap(), 0, size + 100); What is that? > if (!*data) > return E_OUTOFMEMORY; > ret = RegQueryValueExW(hkey, name, 0, NULL, (LPBYTE)*data, &size); > @@ -507,33 +550,16 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( > > case ASSOCSTR_FRIENDLYDOCNAME: > { > - WCHAR *pszFileType; > - DWORD ret; > - DWORD size; > + WCHAR *docName; > + > + if (This->hkeyProgID == NULL) { > + > + } And that? > diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c > index 8aa2535..1ba4261 100644 > --- a/dlls/shell32/tests/assoc.c > +++ b/dlls/shell32/tests/assoc.c > @@ -91,6 +91,8 @@ struct assoc_getstring_test > }; > > static const WCHAR httpW[] = {'h','t','t','p',0}; > +static const WCHAR dot_urlW[] = {'.','u','r','l',0}; > +static const WCHAR InternetShortcutW[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; > static const WCHAR badW[] = {'b','a','d','b','a','d',0}; > > static struct assoc_getstring_test getstring_tests[] = > @@ -135,7 +137,7 @@ static void test_IQueryAssociations_GetString(void) > else > { > ok(hr == ptr->hr, "%d: GetString failed, 0x%08x\n", i, hr); > - ok(len > ptr->len, "%d: got needed length %d\n", i, len); > + ok(len >= ptr->len, "%d: got needed length %d\n", i, len); > } Why '>' was enough before? > + getstring_test(0, NULL, test_progid_key, ASSOCSTR_DEFAULTICON, NULL, S_OK, test_iconW); > + If it's only called with 0 flags, there's no need in this argument. > + //RegDeleteKeyExW(HKEY_CLASSES_ROOT, test_extensionW, KEY_WOW64_32KEY, 0); > + //RegDeleteKeyExW(HKEY_CLASSES_ROOT, test_progidW, KEY_WOW64_32KEY, 0); > +} Leftovers? > + > static void test_IQueryAssociations_Init(void) > { > IQueryAssociations *assoc; > @@ -229,6 +297,7 @@ START_TEST(assoc) > if (hr == S_OK) > { > test_IQueryAssociations_QueryInterface(); > + test_IQueryAssociations_GetString_results(); > test_IQueryAssociations_GetString(); > test_IQueryAssociations_Init(); Please merge this with existing *_GetString().

2 1

Re: shell32/tests: Fix an ok() call so it shows which DDE test caused the failure.
by Marvin 13 Feb '16

13 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20416 Your paranoid android. === wvistau64 (64 bit shlexec) === shlexec.c:2178: Test failed: ShellExecuteEx(mask="0x808040", file="C:/Users/winetest/AppData/Local/Temp/wtD2D8.tmp/test_shortcut_exe.lnk") WaitForSingleObject(hProcess) returned 258 shlexec.c:2178: Test failed: ShellExecuteEx(mask="0x808040", file="C:/Users/winetest/AppData/Local/Temp/wtD2D8.tmp/test_shortcut_exe.lnk") child returned 259

1 0

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 13 Feb '16

13 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20415 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 === w2003std (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 === wvistau64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w2008s64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w7u (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w7pro64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w8 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w864 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w1064 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === wvistau64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w2008s64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w7pro64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w864 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w1064 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0

1 0

Re: [4/5] ntdll/tests: Fix flags passed to VirtualFree in exception tests.
by Marvin 13 Feb '16

13 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20412 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: [1/5] kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Marvin 13 Feb '16

13 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20409 Your paranoid android. === w1064 (32 bit locale) === locale.c:2383: Test failed: LCMapStringEx should fail with bad locale name locale.c:2384: Test failed: unexpected error code -559038737 locale.c:2475: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4198: Test failed: IsValidLocaleName should have failed locale.c:4200: Test failed: IsValidLocaleName should have failed locale.c:4565: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4567: Test failed: For id 7, Expected IVC, got ''

2 1

Re: wineboot: Create serial comm registry keys
by Sebastian Lackner 12 Feb '16

12 Feb '16

On 12.02.2016 00:32, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > For https://bugs.winehq.org/show_bug.cgi?id=11811 > > > programs/wineboot/wineboot.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > Are you sure there are no keys for com ports >= 10? In general, such serial ports are also possible. Nevertheless, more important: If I don't miss anything, the user still has to manually create a symlink in dosdevices/, otherwise this method will not work. Accessing serial ports on the other hand doesn't require any manual configuration when get_default_com_device() recognizes them (and the user has access). What is the benefit when it still requires manual user interaction?

2 5

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 5)
by André Hentschel 12 Feb '16

12 Feb '16

Hi, great to see you continue your work :) But you missed a lot of valuable hints from Sebastian in try 4 and 5 What I need to add is that I'd still like to see the pcap_close function in the same patch and a TRACE in pcap_dump. In pcap_dump you could also remove the return as it is a void function, but the file isn't consistent in that regard anyway. Thinking twice, the pcap_dump function should maybe be a seperate patch, while the pcap_close function really should go in this one. Am 12.02.2016 um 17:14 schrieb Jianqiu Zhang: > From 2c90ac326c3eb2d58c95a219616b6789e98499ef Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Thu, 29 Oct 2015 15:33:28 +0800 > Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/wpcap/wpcap.spec | 4 ++-- > 2 files changed, 46 insertions(+), 2 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index ae9e482..b3bb6a5 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -18,10 +18,13 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "ntstatus.h" > +#define WIN32_NO_STATUS > #include <pcap/pcap.h> > #include "winsock2.h" > #include "windef.h" > #include "winbase.h" > +#include "winternl.h" > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(wpcap); > @@ -339,3 +342,44 @@ int CDECL wine_wsockinit(void) > if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; > return 0; > } > + > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + UNICODE_STRING nt_name, dospathW; > + ANSI_STRING fname_dos; > + ANSI_STRING fname_unix; > + pcap_dumper_t *dumper_data; > + NTSTATUS status; > + TRACE("(%p %s)\n", p, fname); > + RtlInitAnsiString(&fname_dos, fname); > + status = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); > + if (status) > + { > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + if (!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) > + { > + RtlFreeUnicodeString(&dospathW); > + SetLastError(ERROR_PATH_NOT_FOUND); > + return NULL; > + } > + status = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); > + if (status && status != STATUS_NO_SUCH_FILE) > + { > + RtlFreeUnicodeString(&dospathW); > + RtlFreeUnicodeString(&nt_name); > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + RtlFreeUnicodeString(&nt_name); > + RtlFreeUnicodeString(&dospathW); > + dumper_data = pcap_dump_open(p, fname_unix.Buffer); > + RtlFreeAnsiString(&fname_unix); > + return dumper_data; > +} > + > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 66303b4..541fc49 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump > @ stub pcap_dump_close > @ stub pcap_dump_file > @ stub pcap_dump_flush > @ stub pcap_dump_ftell > -@ stub pcap_dump_open > +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open > @ stub pcap_file > @ stub pcap_fileno > @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs > -- > 2.7.1 > > >

1 0

Re: [PATCH] dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
by Nikolay Sivov 12 Feb '16

12 Feb '16

On 12.02.2016 12:00, Charles Davis wrote: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > dlls/dwrite/opentype.c | 39 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 36 insertions(+), 3 deletions(-) > > diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c > index 5b29c21..7d59bf8 100644 > --- a/dlls/dwrite/opentype.c > +++ b/dlls/dwrite/opentype.c > @@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID > TT_NAME_MAC_LANGID_LAO, > TT_NAME_MAC_LANGID_VIETNAMESE, > TT_NAME_MAC_LANGID_INDONESIAN, > - TT_NAME_MAC_LANGID_TAGALONG, > + TT_NAME_MAC_LANGID_TAGALOG, > TT_NAME_MAC_LANGID_MALAY_ROMAN, > TT_NAME_MAC_LANGID_MALAY_ARABIC, > TT_NAME_MAC_LANGID_AMHARIC, > @@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID > TT_NAME_MAC_LANGID_NYANJA, > TT_NAME_MAC_LANGID_MALAGASY, > TT_NAME_MAC_LANGID_ESPERANTO, > - TT_NAME_MAC_LANGID_WELSH, > + TT_NAME_MAC_LANGID_WELSH = 128, > TT_NAME_MAC_LANGID_BASQUE, > TT_NAME_MAC_LANGID_CATALAN, > TT_NAME_MAC_LANGID_LATIN, > - TT_NAME_MAC_LANGID_QUENCHUA, > + TT_NAME_MAC_LANGID_QUECHUA, > TT_NAME_MAC_LANGID_GUARANI, > TT_NAME_MAC_LANGID_AYMARA, > TT_NAME_MAC_LANGID_TATAR, Hi, typos come from https://www.microsoft.com/typography/otspec/name.htm, thanks for fixing this. Broken indexing is something I missed though. I'm curious how did you spot this? Is there some fonts around that use id >= 128 on mac?

2 1