winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
397 discussions
Start a n
N
ew thread
Nikolay Sivov : dwrite: Allow null arguments in opentype_get_font_table().
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 34823028e17c3f34e1e7e23642ef4239841a1750 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=34823028e17c3f34e1e7e2364…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:26:22 2014 +0300 dwrite: Allow null arguments in opentype_get_font_table(). --- dlls/dwrite/opentype.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c007b35..c6f7a52 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -322,7 +322,8 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ int table_count, table_offset = 0; int i; - *found = FALSE; + if (found) *found = FALSE; + if (table_size) *table_size = 0; if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; @@ -363,8 +364,8 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ int length = GET_BE_DWORD(table_record->length); IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); - *found = TRUE; - *table_size = length; + if (found) *found = TRUE; + if (table_size) *table_size = length; hr = IDWriteFontFileStream_ReadFileFragment(stream, table_data, offset, length, table_context); }
1
0
0
0
Nikolay Sivov : dwrite: Implement GetFontFromFontFace().
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 1ab456fde3bec9768ac4045e6fdf2263dad8a7fe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1ab456fde3bec9768ac4045e6…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:25:43 2014 +0300 dwrite: Implement GetFontFromFontFace(). --- dlls/dwrite/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 708a6d8..50c3acb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -47,6 +47,8 @@ struct dwrite_font_data { IDWriteFontFile *file; UINT32 face_index; + IDWriteFontFace2 *face; + WCHAR *facename; }; @@ -88,7 +90,6 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; - IDWriteFontFace2 *face; struct dwrite_font_data *data; }; @@ -220,6 +221,8 @@ static void release_font_data(struct dwrite_font_data *data) IDWriteFontFile_Release(data->file); if (data->factory) IDWriteFactory_Release(data->factory); + if (data->face) + IDWriteFontFace2_Release(data->face); heap_free(data->facename); heap_free(data); } @@ -735,7 +738,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 *fontface = NULL; - if (!font->face) { + if (!font->data->face) { struct dwrite_font_data *data = font->data; IDWriteFontFace *face; @@ -745,11 +748,11 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 if (FAILED(hr)) return hr; - hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->face); + hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->data->face); IDWriteFontFace_Release(face); } - *fontface = font->face; + *fontface = font->data->face; return hr; } @@ -909,7 +912,6 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - if (This->face) IDWriteFontFace2_Release(This->face); if (This->family) IDWriteFontFamily_Release(This->family); release_font_data(This->data); heap_free(This); @@ -1406,8 +1408,40 @@ static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p)->(%p %p): stub\n", This, face, font); - return E_NOTIMPL; + struct dwrite_fontfamily_data *found_family = NULL; + struct dwrite_font_data *found_font = NULL; + IDWriteFontFamily *family; + UINT32 i, j; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, face, font); + + *font = NULL; + + if (!face) + return E_INVALIDARG; + + for (i = 0; i < This->data_count; i++) { + struct dwrite_fontfamily_data *family_data = This->family_data[i]; + for (j = 0; j < family_data->font_count; j++) { + if ((IDWriteFontFace*)family_data->fonts[j]->face == face) { + found_font = family_data->fonts[j]; + found_family = family_data; + break; + } + } + } + + if (!found_font) + return E_INVALIDARG; + + hr = create_fontfamily_from_data(found_family, iface, &family); + if (FAILED(hr)) + return hr; + + hr = create_font_from_data(found_font, family, font); + IDWriteFontFamily_Release(family); + return hr; } static const IDWriteFontCollectionVtbl fontcollectionvtbl = { @@ -1534,6 +1568,7 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI data->factory = factory; data->file = file; + data->face = NULL; data->face_index = face_index; data->face_type = face_type; IDWriteFontFile_AddRef(file); @@ -1790,7 +1825,6 @@ static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontF This->IDWriteFont2_iface.lpVtbl = &dwritefontvtbl; This->ref = 1; - This->face = NULL; This->family = family; if (family) IDWriteFontFamily_AddRef(family);
1
0
0
0
Nikolay Sivov : dwrite: Initialize allocation size for a family before using it.
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 340aa07f60a12e1dab74e779786ace4c4ad7d329 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=340aa07f60a12e1dab74e7797…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:25:19 2014 +0300 dwrite: Initialize allocation size for a family before using it. --- dlls/dwrite/font.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d55e06d..708a6d8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -56,8 +56,8 @@ struct dwrite_fontfamily_data { IDWriteLocalizedStrings *familyname; struct dwrite_font_data **fonts; - UINT32 font_count; - UINT32 alloc; + UINT32 font_count; + UINT32 font_alloc; }; struct dwrite_fontcollection { @@ -1440,16 +1440,16 @@ static HRESULT add_family_syscollection(struct dwrite_fontcollection *collection static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, struct dwrite_font_data *font_data) { - if (family_data->font_count + 1 >= family_data->alloc) { + if (family_data->font_count + 1 >= family_data->font_alloc) { struct dwrite_font_data **new_list; UINT32 new_alloc; - new_alloc = family_data->alloc * 2; + new_alloc = family_data->font_alloc * 2; new_list = heap_realloc(family_data->fonts, sizeof(*family_data->fonts) * new_alloc); if (!new_list) return E_OUTOFMEMORY; family_data->fonts = new_list; - family_data->alloc = new_alloc; + family_data->font_alloc = new_alloc; } family_data->fonts[family_data->font_count] = font_data; @@ -1558,16 +1558,16 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct dwrite_fontfamily_data *data) { - data->fonts = heap_alloc(sizeof(*data->fonts)*data->alloc); + data->ref = 1; + data->font_count = 0; + data->font_alloc = 2; + + data->fonts = heap_alloc(sizeof(*data->fonts)*data->font_alloc); if (!data->fonts) { heap_free(data); return E_OUTOFMEMORY; } - data->ref = 1; - data->font_count = 0; - data->alloc = 2; - data->familyname = familyname; IDWriteLocalizedStrings_AddRef(familyname); @@ -1761,7 +1761,7 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon data->ref = 0; data->font_count = 0; - data->alloc = 2; + data->font_alloc = 2; data->fonts = heap_alloc(sizeof(*data->fonts) * 2); if (!data->fonts) {
1
0
0
0
Nikolay Sivov : dwrite: Block attempts of registering local file loader.
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 5b10a69c3ad3ffd4f27b892ba37164ac76be20c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5b10a69c3ad3ffd4f27b892ba…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:24:47 2014 +0300 dwrite: Block attempts of registering local file loader. --- dlls/dwrite/main.c | 6 ++++++ dlls/dwrite/tests/font.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1e10431..05d853f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -813,6 +813,9 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + if (factory_get_file_loader(This, loader)) return DWRITE_E_ALREADYREGISTERED; @@ -838,6 +841,9 @@ static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *ifa if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + found = factory_get_file_loader(This, loader); if (!found) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2b84ba1..d9e927f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -885,8 +885,7 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory2); - ok(hr == S_OK, "got 0x%08x\n", hr); + factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); ok(coll2 != collection, "got %p, was %p\n", coll2, collection); @@ -943,6 +942,19 @@ if (file) { ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + + /* try with a different factory */ + factory2 = create_factory(); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + IDWriteFactory_Release(factory2); + IDWriteFontFileLoader_Release(loader); } ret = TRUE;
1
0
0
0
Nikolay Sivov : dwrite/tests: Fix recently inroduced test failure.
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: be69977cd5abc1620be87e777dbf29630fe4e62f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=be69977cd5abc1620be87e777…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 26 20:49:26 2014 +0300 dwrite/tests: Fix recently inroduced test failure. --- dlls/dwrite/tests/font.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3830bc9..2b84ba1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1200,8 +1200,12 @@ static void test_CreateCustomFontFileReference(void) IDWriteFontFace_Release(face2); /* file was created with different factory */ + face2 = NULL; hr = IDWriteFactory_CreateFontFace(factory2, face_type, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &face2); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (face2) + IDWriteFontFace_Release(face2); file2 = NULL; hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2);
1
0
0
0
Austin English : kernel32: Add a stub for CancelTimerQueueTimer.
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 1ade676968244d17a03647e8c8d93bab66429100 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1ade676968244d17a03647e8c…
Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 25 01:03:01 2014 -0500 kernel32: Add a stub for CancelTimerQueueTimer. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d08f90c..2b01df1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -182,7 +182,7 @@ @ stub CancelDeviceWakeupRequest @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) -# @ stub CancelTimerQueueTimer +@ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall CancelWaitableTimer(long) @ stdcall ChangeTimerQueueTimer(ptr ptr long long) # @ stub CheckNameLegalDOS8Dot3A diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d399b82..04b3270 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1300,6 +1300,15 @@ BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, } /*********************************************************************** + * CancelTimerQueueTimer (KERNEL32.@) + */ +BOOL WINAPI CancelTimerQueueTimer(HANDLE queue, HANDLE timer) +{ + FIXME("stub: %p %p\n", queue, timer); + return FALSE; +} + +/*********************************************************************** * DeleteTimerQueueTimer (KERNEL32.@) * * Cancels a timer-queue timer.
1
0
0
0
Alexandre Julliard : gdi32: Check the hatch masks instead of the rop masks for the null and mask optimization case.
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 55f24da978c8ad6553a7b8fa874a60648dc61e44 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=55f24da978c8ad6553a7b8fa8…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 14:55:48 2014 +0900 gdi32: Check the hatch masks instead of the rop masks for the null and mask optimization case. --- dlls/gdi32/dibdrv/objects.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 1f05ab0..bc8b60d 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1815,6 +1815,8 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) size -= 4; } + if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -1861,6 +1863,9 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL brush->dib.funcs->create_rop_masks( &brush->dib, hatches[brush->hatch], &fg_mask, &bg_mask, &brush->masks ); + + if (!fg_mask.and && !bg_mask.and) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -1878,6 +1883,9 @@ static BOOL create_dither_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOO rgb = make_rgb_colorref( pdev->dev.hdc, &pdev->dib, brush->colorref, &got_pixel, &pixel ); brush->dib.funcs->create_dither_masks( &brush->dib, brush->rop, rgb, &brush->masks ); + + if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -2018,7 +2026,6 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, ERR("Unexpected brush style %d\n", brush->style); return FALSE; } - if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ } GetBrushOrgEx(pdev->dev.hdc, &origin);
1
0
0
0
André Hentschel : winedump: Ensure function order in a printf (PVS-Studio).
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 86c249760d6da8bfc6d0e009fb3a7db50c102307 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=86c249760d6da8bfc6d0e009f…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 17:55:11 2014 +0200 winedump: Ensure function order in a printf (PVS-Studio). --- tools/winedump/tlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 26da2a4..df1ea4b 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -647,7 +647,8 @@ static BOOL dump_msft_custdata(seg_t *seg) break; default: printf(": %x ", n); - printf("\\%2.2x \\%2.2x\n", tlb_read_byte(), tlb_read_byte()); + printf("\\%2.2x ", tlb_read_byte()); + printf("\\%2.2x\n", tlb_read_byte()); } }
1
0
0
0
André Hentschel : urlmon/tests: Clarify ok() condition.
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: 2bb59197ace6776e03bbc014cabc8fd7b7360615 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2bb59197ace6776e03bbc014c…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 16:35:31 2014 +0200 urlmon/tests: Clarify ok() condition. --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5861127..3d10323 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -764,7 +764,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } IHttpNegotiate2_Release(http_negotiate2); ok(hres == E_FAIL, "GetRootSecurityId failed: %08x, expected E_FAIL\n", hres); - ok(size == no_callback ? 512 : 13, "size=%d\n", size); + ok(size == (no_callback ? 512 : 13), "size=%d\n", size); if(!no_callback) { SET_EXPECT(QueryService_IHttpSecurity);
1
0
0
0
Bruno Jesus : advapi32/tests: Add a test for enumerating a registry key without setting it.
by Alexandre Julliard
27 Oct '14
27 Oct '14
Module: wine Branch: master Commit: cbc8d290b9860e047ba21f70fe8672be325393b8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cbc8d290b9860e047ba21f70f…
Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 21:38:03 2014 -0200 advapi32/tests: Add a test for enumerating a registry key without setting it. --- dlls/advapi32/tests/registry.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 85f50ce..82391e1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -517,6 +517,33 @@ static void test_enum_value(void) res = RegSetValueExA( test_key, "Test", 0, REG_BINARY, NULL, 0 ); ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + /* test reading the value and data without setting them */ + val_count = 20; + data_count = 20; + type = 1234; + strcpy( value, "xxxxxxxxxx" ); + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !strcmp( value, "Test" ), "value is '%s' instead of Test\n", value ); + ok( !strcmp( data, "xxxxxxxxxx" ), "data is '%s' instead of xxxxxxxxxx\n", data ); + + val_count = 20; + data_count = 20; + type = 1234; + memcpy( valueW, xxxW, sizeof(xxxW) ); + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); + ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data is not 'xxxxxxxxxx'\n" ); + res = RegSetValueExA( test_key, "Test", 0, REG_SZ, (const BYTE *)"foobar", 7 ); ok( res == 0, "RegSetValueExA failed error %d\n", res );
1
0
0
0
← Newer
1
...
7
8
9
10
11
12
13
...
40
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
Results per page:
10
25
50
100
200