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
May 2022
----- 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
907 discussions
Start a n
N
ew thread
Bernhard Kölbl : windows.media.speech: Rename async_operation to async_inspectable.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 61a4cb972e5f4657caed10794dd291dc13d68ef5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=61a4cb972e5f4657caed1079…
Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 3 13:15:08 2022 +0200 windows.media.speech: Rename async_operation to async_inspectable. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 125 +++++++++++++++++---------------- dlls/windows.media.speech/private.h | 5 +- dlls/windows.media.speech/recognizer.c | 2 +- 3 files changed, 68 insertions(+), 64 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=61a4cb972e5f4657caed…
1
0
0
0
Bernhard Kölbl : windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 0636cf580868ce870b4024e78766bf83fabe9dda URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0636cf580868ce870b4024e7…
Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 27 19:12:46 2022 +0200 windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed. This one actually retrieves a handler. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 827596bbfb6..33da6828dc2 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -860,7 +860,7 @@ static void test_SpeechRecognizer(void) HANDLE put_thread; HRESULT hr, error_code; UINT32 id; - LONG ref; + LONG ref, old_ref; hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr); @@ -1137,6 +1137,16 @@ static void test_SpeechRecognizer(void) todo_wine ok(compilation_handler.ref == 3, "Got unexpected ref %lu.\n", compilation_handler.ref); todo_wine check_refcount(operation, 3); + handler = (void*)0xdeadbeef; + old_ref = compilation_handler.ref; + hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler); + ok(hr == S_OK, "IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed failed, hr %#lx.\n", hr); + todo_wine ok(handler == &compilation_handler.IAsyncHandler_Compilation_iface, "Handler was %p.\n", handler); + + ref = compilation_handler.ref - old_ref; + todo_wine ok(ref == 1, "The ref was increased by %lu.\n", ref); + if (handler) IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult_Release(handler); + hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
1
0
0
0
Bernhard Kölbl : windows.media.speech/tests: Remove some unreliable ref checks.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 44cee36ca9b81fe897bbbbeebe5e6f10f0daf04f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=44cee36ca9b81fe897bbbbee…
Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri May 13 14:08:04 2022 +0200 windows.media.speech/tests: Remove some unreliable ref checks. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 5ae3ac27d8d..827596bbfb6 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1060,8 +1060,7 @@ static void test_SpeechRecognizer(void) ok(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_ErrorCode failed, hr %#lx.\n", hr); ok(error_code == E_ILLEGAL_METHOD_CALL, "ErrorCode was %#lx.\n", error_code); - ref = IAsyncInfo_Release(info); - ok(ref == 1, "Got unexpected ref %lu.\n", ref); + IAsyncInfo_Release(info); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); @@ -1102,10 +1101,8 @@ static void test_SpeechRecognizer(void) ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); ok(async_status == Completed, "Status was %#x.\n", async_status); - ref = IAsyncInfo_Release(info); - ok(ref >= 1, "Got unexpected ref %lu.\n", ref); - ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); - ok(ref >= 0, "Got unexpected ref %lu.\n", ref); + IAsyncInfo_Release(info); + IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); ref = ISpeechRecognizer_Release(recognizer); ok(ref == 1, "Got unexpected ref %lu.\n", ref); @@ -1153,12 +1150,10 @@ static void test_SpeechRecognizer(void) CloseHandle(compilation_handler.event_block); CloseHandle(compilation_handler.event_finished); - ref = IAsyncInfo_Release(info); - ok(ref == 1, "Got unexpected ref %lu.\n", ref); + IAsyncInfo_Release(info); skip_operation: - ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); - ok(!ref, "Got unexpected ref %lu.\n", ref); + IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); ref = ISpeechRecognizer_Release(recognizer); ok(ref == 1, "Got unexpected ref %lu.\n", ref);
1
0
0
0
Bernhard Kölbl : windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 01d531f16f0374fd6da1dac85e9356f6fd81bdf3 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=01d531f16f0374fd6da1dac8…
Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri May 13 22:24:04 2022 +0200 windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent. And do some minor naming changes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 9ef49b160cd..5ae3ac27d8d 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -815,15 +815,15 @@ static void test_VoiceInformation(void) RoUninitialize(); } -struct async_operation_block_param +struct put_completed_thread_param { IAsyncOperationCompletedHandler_SpeechRecognitionCompilationResult *handler; IAsyncOperation_SpeechRecognitionCompilationResult *operation; }; -static DWORD WINAPI async_operation_block_thread(void *arg) +static DWORD WINAPI put_completed_thread(void *arg) { - struct async_operation_block_param *param = arg; + struct put_completed_thread_param *param = arg; HRESULT hr; hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(param->operation, param->handler); @@ -849,15 +849,15 @@ static void test_SpeechRecognizer(void) IInspectable *inspectable = NULL; ILanguage *language = NULL; IAsyncInfo *info = NULL; + struct put_completed_thread_param put_completed_param; struct completed_event_handler completed_handler; struct recognition_result_handler result_handler; - struct async_operation_block_param block_param; struct compilation_handler compilation_handler; SpeechRecognitionResultStatus result_status; EventRegistrationToken token = { .value = 0 }; AsyncStatus async_status; HSTRING hstr, hstr_lang; - HANDLE blocked_thread; + HANDLE put_thread; HRESULT hr, error_code; UINT32 id; LONG ref; @@ -1125,19 +1125,18 @@ static void test_SpeechRecognizer(void) compilation_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL); compilation_handler.thread_id = GetCurrentThreadId(); - ok(compilation_handler.event_finished != NULL, "Finished event wasn't created.\n"); + ok(!!compilation_handler.event_block, "event_block wasn't created.\n"); + ok(!!compilation_handler.event_finished, "event_finished wasn't created.\n"); hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); - block_param.handler = &compilation_handler.IAsyncHandler_Compilation_iface; - block_param.operation = operation; - blocked_thread = CreateThread(NULL, 0, async_operation_block_thread, &block_param, 0, NULL); + put_completed_param.handler = &compilation_handler.IAsyncHandler_Compilation_iface; + put_completed_param.operation = operation; + put_thread = CreateThread(NULL, 0, put_completed_thread, &put_completed_param, 0, NULL); ok(!WaitForSingleObject(compilation_handler.event_finished, 5000), "Wait for event_finished failed.\n"); - ok(WaitForSingleObject(blocked_thread, 100) == WAIT_TIMEOUT, "Wait for block_thread didn't time out.\n"); - todo_wine ok(compilation_handler.ref == 3, "Got unexpected ref %lu.\n", compilation_handler.ref); todo_wine check_refcount(operation, 3); @@ -1148,9 +1147,9 @@ static void test_SpeechRecognizer(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); SetEvent(compilation_handler.event_block); - ok(!WaitForSingleObject(blocked_thread, 1000), "Wait for block_thread failed.\n"); + ok(!WaitForSingleObject(put_thread, 1000), "Wait for block_thread failed.\n"); - CloseHandle(blocked_thread); + CloseHandle(put_thread); CloseHandle(compilation_handler.event_block); CloseHandle(compilation_handler.event_finished);
1
0
0
0
Bernhard Kölbl : windows.media.speech: Add a missing trace to async_operation_create.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: fc6857c4321f4c002121b1e387b6aba1547d3d30 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=fc6857c4321f4c002121b1e3…
Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Apr 25 12:18:14 2022 +0200 windows.media.speech: Add a missing trace to async_operation_create. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 64a095a0134..e7547225c1c 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -367,6 +367,8 @@ HRESULT async_operation_create( const GUID *iid, IInspectable *invoker, async_op { struct async_operation *impl; + TRACE("iid %s, invoker %p, callback %p, out %p.\n", debugstr_guid(iid), invoker, callback, out); + *out = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; impl->IAsyncOperation_IInspectable_iface.lpVtbl = &async_operation_vtbl;
1
0
0
0
Hans Leidekker : msi/tests: Fix an intermittent test failure.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 7bf7340eb6e7135d45c7f233649cfe4989eaf3d2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7bf7340eb6e7135d45c7f233…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat May 14 12:16:46 2022 +0200 msi/tests: Fix an intermittent test failure. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52993
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 224637eb286..e5c862e206c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3690,9 +3690,10 @@ static void test_publish(void) LONG res; HKEY uninstall, prodkey, uninstall_32node = NULL; INSTALLSTATE state; - char date[MAX_PATH], temp[MAX_PATH], prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + char date[MAX_PATH], date2[MAX_PATH], temp[MAX_PATH], buf[MAX_PATH]; + const char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; REGSAM access = KEY_ALL_ACCESS; - DWORD error; + DWORD error, type, size; if (!pMsiQueryFeatureStateExA) { @@ -4216,7 +4217,15 @@ static void test_publish(void) CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayVersion", "1.1.1"); - CHECK_REG_STR(prodkey, "InstallDate", date); + + get_date_str(date2); + size = ARRAY_SIZE(buf); + buf[0] = '\0'; + res = RegQueryValueExA(prodkey, "InstallDate", NULL, &type, (BYTE *)buf, &size); + ok(!res, "Failed to query value, error %ld\n", res); + ok(type == REG_SZ, "Got wrong type %lu\n", type); + ok(!strcmp(buf, date) || !strcmp(buf, date2), "got %s\n", debugstr_a(buf)); + CHECK_REG_STR(prodkey, "InstallSource", temp); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
1
0
0
0
Dmitry Timoshkov : d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush().
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 8151e695e31d52c9a739d9648afd9a27265e1f0b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8151e695e31d52c9a739d964…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 16 08:22:13 2022 +0300 d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ca80a8e946b..035915491fd 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2291,6 +2291,120 @@ static void test_bitmap_brush(BOOL d3d11) release_test_context(&ctx); } +static void test_image_brush(BOOL d3d11) +{ + D2D1_IMAGE_BRUSH_PROPERTIES image_brush_desc; + D2D1_INTERPOLATION_MODE interp_mode; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D1_BRUSH_PROPERTIES brush_desc; + ID2D1Image *image, *tmp_image; + struct d2d1_test_context ctx; + D2D1_EXTEND_MODE extend_mode; + D2D1_MATRIX_3X2_F matrix; + ID2D1ImageBrush *brush; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + D2D1_RECT_F rect; + ULONG refcount; + float opacity; + HRESULT hr; + BOOL match; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const D2D1_MATRIX_3X2_F identity = + {{{ + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }}}; + + if (!init_test_context(&ctx, d3d11)) + return; + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Only image brush description is required. */ + set_rect(&image_brush_desc.sourceRectangle, 1.0f, 2.0f, 3.0f, 4.0f); + image_brush_desc.extendModeX = D2D1_EXTEND_MODE_WRAP; + image_brush_desc.extendModeY = D2D1_EXTEND_MODE_MIRROR; + image_brush_desc.interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR; + + hr = ID2D1DeviceContext_CreateImageBrush(device_context, NULL, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + tmp_image = (void *)0xdeadbeef; + ID2D1ImageBrush_GetImage(brush, &tmp_image); + ok(!tmp_image, "Unexpected image %p.\n", image); + + opacity = ID2D1ImageBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Unexpected opacity %.8e.\n", opacity); + ID2D1ImageBrush_GetTransform(brush, &matrix); + ok(!memcmp(&matrix, &identity, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + matrix._11, matrix._12, matrix._21, matrix._22, matrix._31, matrix._32); + + ID2D1ImageBrush_GetSourceRectangle(brush, &rect); + match = compare_rect(&rect, 1.0f, 2.0f, 3.0f, 4.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + extend_mode = ID2D1ImageBrush_GetExtendModeX(brush); + ok(extend_mode == D2D1_EXTEND_MODE_WRAP, "Unexpected extend mode %u.\n", extend_mode); + extend_mode = ID2D1ImageBrush_GetExtendModeY(brush); + ok(extend_mode == D2D1_EXTEND_MODE_MIRROR, "Unexpected extend mode %u.\n", extend_mode); + interp_mode = ID2D1ImageBrush_GetInterpolationMode(brush); + ok(interp_mode == D2D1_INTERPOLATION_MODE_LINEAR, "Unexpected interpolation mode %u.\n", interp_mode); + + ID2D1ImageBrush_Release(brush); + + /* Custom brush description and image pointer. */ + brush_desc.opacity = 2.0f; + set_matrix_identity(&brush_desc.transform); + scale_matrix(&brush_desc.transform, 2.0f, 3.0f); + + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, &brush_desc, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_GetImage(brush, &tmp_image); + ok(tmp_image == image, "Got unexpected image %p, expected %p.\n", tmp_image, image); + ID2D1Image_Release(tmp_image); + + opacity = ID2D1ImageBrush_GetOpacity(brush); + ok(opacity == 2.0f, "Unexpected opacity %.8e.\n", opacity); + ID2D1ImageBrush_GetTransform(brush, &matrix); + ok(!memcmp(&matrix, &brush_desc.transform, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + matrix._11, matrix._12, matrix._21, matrix._22, matrix._31, matrix._32); + + ID2D1ImageBrush_Release(brush); + + ID2D1Image_Release(image); + refcount = ID2D1Bitmap_Release(bitmap); + ok(!refcount, "Bitmap has %lu references left.\n", refcount); + + ID2D1DeviceContext_Release(device_context); + release_test_context(&ctx); +} + static void test_linear_brush(BOOL d3d11) { D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES gradient_properties; @@ -10919,6 +11033,7 @@ START_TEST(d2d1) queue_test(test_state_block); queue_test(test_color_brush); queue_test(test_bitmap_brush); + queue_test(test_image_brush); queue_test(test_linear_brush); queue_test(test_radial_brush); queue_test(test_path_geometry);
1
0
0
0
Dmitry Timoshkov : d2d1: Implement ID2D1DeviceContext::CreateImageBrush().
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 73ca65b0b23ac832065038352d53d2d0d654344e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=73ca65b0b23ac83206503835…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 16 08:22:12 2022 +0300 d2d1: Implement ID2D1DeviceContext::CreateImageBrush(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 12 +++ dlls/d2d1/device.c | 14 ++- 3 files changed, 265 insertions(+), 4 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ca65b0b23ac8320650…
1
0
0
0
James McDonnell : d2d1: Add a stub for ID2D1PathGeometry1.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 67b70b867e9a9e93fc7e1bfe36acdca358baa5bd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=67b70b867e9a9e93fc7e1bfe…
Author: James McDonnell <topgamer7(a)gmail.com> Date: Mon May 16 08:38:08 2022 +0300 d2d1: Add a stub for ID2D1PathGeometry1. Signed-off-by: James McDonnell <topgamer7(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 14 +++++++-- dlls/d2d1/geometry.c | 82 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 59 insertions(+), 37 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=67b70b867e9a9e93fc7e…
1
0
0
0
James McDonnell : include: Add ID2D1PathGeometry1 definition.
by Alexandre Julliard
16 May '22
16 May '22
Module: wine Branch: master Commit: 0b288df3e91cfe2826afb24ac919f0e3ccb386bb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0b288df3e91cfe2826afb24a…
Author: James McDonnell <topgamer7(a)gmail.com> Date: Mon May 16 08:38:07 2022 +0300 include: Add ID2D1PathGeometry1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index fdec8ae5f9c..b8af40cc9a8 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -20,7 +20,6 @@ import "d2d1.idl"; import "d2d1effects.idl"; interface ID2D1DeviceContext; -interface ID2D1PathGeometry1; interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; @@ -349,6 +348,22 @@ interface ID2D1GdiMetafile : ID2D1Resource ); } +[ + object, + uuid(62baa2d2-ab54-41b7-b872-787e0106a421), + local, +] +interface ID2D1PathGeometry1 : ID2D1PathGeometry +{ + HRESULT ComputePointAndSegmentAtLength( + [in] float length, + [in] UINT32 start_segment, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] D2D1_POINT_DESCRIPTION *point_desc + ); +} + [ object, uuid(483473d7-cd46-4f9d-9d3a-3112aa80159d),
1
0
0
0
← Newer
1
...
50
51
52
53
54
55
56
...
91
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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
Results per page:
10
25
50
100
200