wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Alex Henrie : include: Allow programs to take the address of byte-swapping functions.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 99684bc4256b56580d49c882df68fa8632b45c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99684bc4256b56580d49c882d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 17 09:11:57 2017 -0600 include: Allow programs to take the address of byte-swapping functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index cf9adf5..8bb067f 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -519,10 +519,18 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*); #ifdef WORDS_BIGENDIAN -#define htonl(l) ((ULONG)(l)) -#define htons(s) ((u_short)(s)) -#define ntohl(l) ((ULONG)(l)) -#define ntohs(s) ((u_short)(s)) +static inline u_short __wine_ushort_noop(u_short s) +{ + return s; +} +static inline ULONG __wine_ulong_noop(ULONG l) +{ + return l; +} +#define htonl __wine_ulong_noop +#define htons __wine_ushort_noop +#define ntohl __wine_ulong_noop +#define ntohs __wine_ushort_noop #else /* WORDS_BIGENDIAN */ @@ -534,10 +542,10 @@ static inline ULONG __wine_ulong_swap(ULONG l) { return ((ULONG)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16)); } -#define htonl(l) __wine_ulong_swap(l) -#define htons(s) __wine_ushort_swap(s) -#define ntohl(l) __wine_ulong_swap(l) -#define ntohs(s) __wine_ushort_swap(s) +#define htonl __wine_ulong_swap +#define htons __wine_ushort_swap +#define ntohl __wine_ulong_swap +#define ntohs __wine_ushort_swap #endif /* WORDS_BIGENDIAN */

1 0

Andrew Eikum : gdiplus: Fix copy-paste typo.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 79ebd3f3bf9e5b6607363667d03def04e254f710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ebd3f3bf9e5b6607363667d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 23 11:40:56 2017 -0500 gdiplus: Fix copy-paste typo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 80206c9..d20df77 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4353,7 +4353,7 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GD for(i = 0; i < count; i++){ rectsF[i].X = (REAL)rects[i].X; rectsF[i].Y = (REAL)rects[i].Y; - rectsF[i].X = (REAL)rects[i].Width; + rectsF[i].Width = (REAL)rects[i].Width; rectsF[i].Height = (REAL)rects[i].Height; }

1 0

Hugh McMaster : regedit/tests: Add Unicode import tests and remove the WCHAR support check.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: d8cdafcc6f1857904eaeeb2ca4962fb120d788a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cdafcc6f1857904eaeeb2ca… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 23 12:57:30 2017 +0000 regedit/tests: Add Unicode import tests and remove the WCHAR support check. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 580 ++++++++++++++++++++++++++++++++------- 1 file changed, 481 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8cdafcc6f1857904eaee…

1 0

Hugh McMaster : reg/tests: Free the WCHAR memory buffer if CreateFile() fails.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: e0a97d32e24528128b874641393107bac0591fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a97d32e24528128b8746413… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 23 12:31:56 2017 +0000 reg/tests: Free the WCHAR memory buffer if CreateFile() fails. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0a2fdbf..f6a7ce1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -771,8 +771,11 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + if (regfile == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, wstr); return FALSE; + } ret = WriteFile(regfile, wstr, memsize, &written, NULL); lok(ret, "WriteFile failed: %u\n", GetLastError());

1 0

Hugh McMaster : reg/tests: Pass MultiByteToWideChar() the buffer size in characters.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: c618e99475f201a68d427132338a95a8812c43f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c618e99475f201a68d4271323… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 23 12:31:47 2017 +0000 reg/tests: Pass MultiByteToWideChar() the buffer size in characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b042614..0a2fdbf 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -766,7 +766,7 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r memsize = len * sizeof(WCHAR); wstr = HeapAlloc(GetProcessHeap(), 0, memsize); if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, memsize); + MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Alistair Leslie-Hughes : quartz: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 84f5761a6786f1e3bdc5bbb10c2b413610df07d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f5761a6786f1e3bdc5bbb10… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 22 21:50:12 2017 +0000 quartz: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 12 ++++++------ dlls/quartz/filesource.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index a1b4fbe..b6fd9f1 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -575,7 +575,7 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **ind TRACE("bIndexType: %u\n", pIndex->bIndexType); TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse); TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId); - TRACE("qwBaseOffset: %x%08x\n", (DWORD)(pIndex->qwBaseOffset >> 32), (DWORD)pIndex->qwBaseOffset); + TRACE("qwBaseOffset: %s\n", wine_dbgstr_longlong(pIndex->qwBaseOffset)); TRACE("dwReserved_3: %u\n", pIndex->dwReserved_3); if (pIndex->bIndexType != AVI_INDEX_OF_CHUNKS @@ -595,7 +595,7 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **ind { BOOL keyframe = !(pIndex->aIndex[x].dwSize >> 31); DWORDLONG offset = pIndex->qwBaseOffset + pIndex->aIndex[x].dwOffset; - TRACE("dwOffset: %x%08x\n", (DWORD)(offset >> 32), (DWORD)offset); + TRACE("dwOffset: %s\n", wine_dbgstr_longlong(offset)); TRACE("dwSize: %u\n", (pIndex->aIndex[x].dwSize & ~(1u << 31))); TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); } @@ -646,9 +646,9 @@ static HRESULT AVISplitter_ProcessOldIndex(AVISplitterImpl *This) } else if (temp2 != chunkid) { - ERR("Faulty index or bug in handling: Wanted FCC: %s, Abs FCC: %s (@ %x), Rel FCC: %s (@ %.0x%08x)\n", + ERR("Faulty index or bug in handling: Wanted FCC: %s, Abs FCC: %s (@ %x), Rel FCC: %s (@ %s)\n", debugstr_an((char *)&chunkid, 4), debugstr_an((char *)&temp, 4), offset, - debugstr_an((char *)&temp2, 4), (DWORD)((mov_pos + offset) >> 32), (DWORD)(mov_pos + offset)); + debugstr_an((char *)&temp2, 4), wine_dbgstr_longlong(mov_pos + offset)); relative = -1; } else @@ -845,7 +845,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE stream->stdindex = CoTaskMemRealloc(stream->stdindex, sizeof(*stream->stdindex) * stream->entries); for (x = 0; x < pIndex->nEntriesInUse; ++x) { - TRACE("qwOffset: %x%08x\n", (DWORD)(pIndex->aIndex[x].qwOffset >> 32), (DWORD)pIndex->aIndex[x].qwOffset); + TRACE("qwOffset: %s\n", wine_dbgstr_longlong(pIndex->aIndex[x].qwOffset)); TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); TRACE("dwDuration: %u (unreliable)\n", pIndex->aIndex[x].dwDuration); @@ -1134,7 +1134,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); if (pos > total) { - ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); + ERR("File smaller (%s) then EndOfFile (%s)\n", wine_dbgstr_longlong(total), wine_dbgstr_longlong(pAviSplit->EndOfFile)); return E_FAIL; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ed7e5ee..4154512 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1335,7 +1335,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG ll HRESULT hr = S_OK; FileAsyncReader *This = impl_from_IAsyncReader(iface); - TRACE("(%x%08x, %d, %p)\n", (ULONG)(llPosition >> 32), (ULONG)llPosition, lLength, pBuffer); + TRACE("(%s, %d, %p)\n", wine_dbgstr_longlong(llPosition), lLength, pBuffer); ZeroMemory(&ovl, sizeof(ovl));

1 0

Alistair Leslie-Hughes : fusion: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: da03b46d3e665bed8febab0c5c6a0ad9f3bebdff URL: http://source.winehq.org/git/wine.git/?a=commit;h=da03b46d3e665bed8febab0c5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 22 21:49:55 2017 +0000 fusion: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 0baea2f..1bfe9c1 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -360,9 +360,9 @@ static HRESULT WINAPI IAssemblyNameImpl_Reserved(IAssemblyName *iface, DWORD cbReserved, LPVOID *ppReserved) { - TRACE("(%p, %s, %p, %p, %s, %x%08x, %p, %d, %p)\n", iface, + TRACE("(%p, %s, %p, %p, %s, %s, %p, %d, %p)\n", iface, debugstr_guid(refIID), pUnkReserved1, pUnkReserved2, - debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved, + debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); return E_NOTIMPL;

1 0

Alistair Leslie-Hughes : sxs: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 3c4f6ed8122fa3950fdf573254e092e7be44d619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4f6ed8122fa3950fdf57325… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 22 21:50:03 2017 +0000 sxs: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/name.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index bb7f094..74aece2 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -173,9 +173,9 @@ static HRESULT WINAPI name_Reserved( DWORD cbReserved, LPVOID *ppReserved ) { - FIXME("%p, %s, %p, %p, %s, %x%08x, %p, %d, %p\n", iface, + FIXME("%p, %s, %p, %p, %s, %s, %p, %d, %p\n", iface, debugstr_guid(riid), pUnkReserved1, pUnkReserved2, - debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved, + debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite/tests: Some tests for system font set.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 7bac9a025a687832e805c43c27305ecbc7082433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bac9a025a687832e805c43c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 22 12:42:14 2017 +0300 dwrite/tests: Some tests for system font set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index fe2d802..417cc21 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2291,7 +2291,9 @@ static void test_system_fontcollection(void) hr = IDWriteFontCollection_QueryInterface(collection, &IID_IDWriteFontCollection1, (void**)&collection1); if (hr == S_OK) { + IDWriteFontSet *fontset, *fontset2; IDWriteFontFamily1 *family1; + IDWriteFactory3 *factory3; hr = IDWriteFontCollection1_QueryInterface(collection1, &IID_IDWriteFontCollection, (void**)&coll2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2306,6 +2308,39 @@ static void test_system_fontcollection(void) hr = IDWriteFontCollection1_GetFontFamily(collection1, 0, &family1); ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFamily1_Release(family1); + + /* system fontset */ + EXPECT_REF(collection1, 2); + EXPECT_REF(factory, 2); + hr = IDWriteFontCollection1_GetFontSet(collection1, &fontset); + todo_wine + ok(hr == S_OK, "Failed to get fontset, hr %#x.\n", hr); + if (hr == S_OK) { + EXPECT_REF(collection1, 2); + EXPECT_REF(factory, 2); + EXPECT_REF(fontset, 1); + + hr = IDWriteFontCollection1_GetFontSet(collection1, &fontset2); + ok(hr == S_OK, "Failed to get fontset, hr %#x.\n", hr); + ok(fontset != fontset2, "Expected new fontset instance.\n"); + EXPECT_REF(fontset2, 1); + IDWriteFontSet_Release(fontset2); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory3, (void **)&factory3); + ok(hr == S_OK, "Failed to get IDWriteFactory3 interface, hr %#x.\n", hr); + + EXPECT_REF(factory, 3); + hr = IDWriteFactory3_GetSystemFontSet(factory3, &fontset2); + ok(hr == S_OK, "Failed to get system font set, hr %#x.\n", hr); + ok(fontset != fontset2, "Expected new fontset instance.\n"); + EXPECT_REF(fontset2, 1); + EXPECT_REF(factory, 4); + + IDWriteFontSet_Release(fontset2); + IDWriteFontSet_Release(fontset); + + IDWriteFactory3_Release(factory3); + } IDWriteFontCollection1_Release(collection1); } else

1 0

Nikolay Sivov : dwrite: Use safer method to set per-factory EUDC collection reference.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: f85def77654cecdcb78ac77e7a738c6601c4f0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85def77654cecdcb78ac77e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 22 12:42:13 2017 +0300 dwrite: Use safer method to set per-factory EUDC collection reference. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3d72a02..555860a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1272,10 +1272,20 @@ static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory5 *ifac if (This->eudc_collection) IDWriteFontCollection1_AddRef(This->eudc_collection); - else - hr = get_eudc_fontcollection(iface, &This->eudc_collection); + else { + IDWriteFontCollection1 *eudc_collection; + + if (FAILED(hr = get_eudc_fontcollection(iface, &eudc_collection))) { + *collection = NULL; + WARN("Failed to get EUDC collection, hr %#x.\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&This->eudc_collection, eudc_collection, NULL)) + IDWriteFontCollection1_Release(eudc_collection); + } - *collection = (IDWriteFontCollection*)This->eudc_collection; + *collection = (IDWriteFontCollection *)This->eudc_collection; return hr; } @@ -1801,8 +1811,7 @@ void factory_detach_fontcollection(IDWriteFactory5 *iface, IDWriteFontCollection { struct dwritefactory *factory = impl_from_IDWriteFactory5(iface); InterlockedCompareExchangePointer((void **)&factory->system_collection, NULL, collection); - if (factory->eudc_collection == collection) - factory->eudc_collection = NULL; + InterlockedCompareExchangePointer((void **)&factory->eudc_collection, NULL, collection); IDWriteFactory5_Release(iface); }

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
36
Older →

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 August 2017